Merge branch 'master' into x-updates

pkgs/applications/graphics/openscad/default.nix

@@ -1,32 +1,40 @@
-{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
+{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
   , mpfr, gmp
   }:
 
 stdenv.mkDerivation rec {
-  version = "git-20121213";
+  version = "2013.01";
   name = "openscad-${version}";
-  # src = fetchurl {
+
-  #   url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz";
+  src = fetchurl {
-  #   sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh";
+    url = "https://openscad.googlecode.com/files/${name}.src.tar.gz";
-  # };
+    sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f";
-  src = fetchgit {
-    url = "https://github.com/openscad/openscad.git";
-    rev = "c0612a9ed0899c96963e04c848a59b0164a689a2";
-    sha256  = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2";
   };
 
   buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr];
 
   configurePhase = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) "
-    qmake PREFIX="$out"
+    qmake PREFIX="$out" VERSION=${version}
   '';
 
   doCheck = false;
 
   meta = {
     description = "3D parametric model compiler";
+    longDescription = ''
+      OpenSCAD is a software for creating solid 3D CAD objects. It is free
+      software and available for Linux/UNIX, MS Windows and Mac OS X.
+
+      Unlike most free software for creating 3D models (such as the famous
+      application Blender) it does not focus on the artistic aspects of 3D
+      modelling but instead on the CAD aspects. Thus it might be the
+      application you are looking for when you are planning to create 3D models of
+      machine parts but pretty sure is not what you are looking for when you are more
+      interested in creating computer-animated movies.
+    '';
     homepage = "http://openscad.org/";
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms;
       linux;
     maintainers = with stdenv.lib.maintainers; 

pkgs/applications/misc/zathura/core/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils }:
+{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5";
   };
 
-  buildInputs = [ pkgconfig gtk girara gettext ];
+  buildInputs = [ pkgconfig gtk girara gettext makeWrapper ];
 
   # Bug in zathura build system: we should remove empty manfiles in order them
   # to be compiled properly
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
 
+  postInstall = ''
+    wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin"
+  '';
+
   meta = {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A core component for zathura PDF viewer";

pkgs/applications/networking/bittorrentsync/default.nix

@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, patchelf }:
+
+# this package contains the daemon version of bittorrent sync
+
+# it's unfortunately closed source.
+
+let
+  # TODO: arm, ppc, osx
+
+  arch = if stdenv.system == "x86_64-linux" then "x64"
+    else if stdenv.system == "i686-linux" then "i386"
+    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
+    
+  interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2"
+    else if stdenv.system == "i686-linux" then "ld-linux.so.2"
+    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
+
+  version = "1.0.116";
+  sha256 = if stdenv.system == "x86_64-linux" then "108c11x8lp0a4irq88raclz3zfvmkxsqymxx3y8amc1lc6kc3n8i"
+    else if stdenv.system == "i686-linux" then "0kkxi04rggq6lrvn7g1xjay2nskqn7z4qkm0h0lcra7h2jz09mf1"
+    else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
+
+in stdenv.mkDerivation {
+  name = "btsync-bin-${version}";
+  src = fetchurl {
+    # TODO: using version-specific URL: http://forum.bittorrent.com/topic/18070-versioned-binary-downloads/#entry45868
+    url = "http://btsync.s3-website-us-east-1.amazonaws.com/btsync_${arch}.tar.gz";
+    inherit sha256;
+  };
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    ensureDir "$out/bin/"
+    cp -r "btsync" "$out/bin/"
+
+    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
+      "$out/bin/btsync"
+  '';
+
+  buildInputs = [ patchelf ];
+
+  meta = {
+    homepage = "http://labs.bittorrent.com/experiments/sync.html";
+    description = "Automatically sync files via secure, distributed technology.";
+    license = stdenv.lib.licenses.unfreeRedistributable;
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
+  };
+}

pkgs/applications/networking/browsers/chromium/default.nix

@@ -13,13 +13,7 @@
 , gcc, bison, gperf
 , glib, gtk, dbus_glib
 , libXScrnSaver, libXcursor, mesa
-, protobuf
+, protobuf, speechd, libXdamage
-
-# dependencies for v25 only
-, libvpx
-
-# dependencies for >= v26
-, speechd, libXdamage
 
 # dependencies for >= v27
 , libXtst
@@ -69,7 +63,7 @@ let
     use_system_xdg_utils = true;
     use_system_yasm = true;
     use_system_zlib = false; # http://crbug.com/143623
-    use_system_protobuf = post25;
+    use_system_protobuf = true;
 
     use_system_harfbuzz = false;
     use_system_icu = false;
@@ -77,9 +71,6 @@ let
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
     use_system_v8 = false;
-  } // optionalAttrs pre26 {
-    use_system_libvpx = true;
-    use_system_protobuf = true;
   };
 
   defaultDependencies = [
@@ -90,10 +81,10 @@ let
     libusb1 libexif
   ];
 
-  pre26 = versionOlder sourceInfo.version "26.0.0.0";
   pre27 = versionOlder sourceInfo.version "27.0.0.0";
-  post25 = !pre26;
+  pre28 = versionOlder sourceInfo.version "28.0.0.0";
   post26 = !pre27;
+  post27 = !pre28;
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
@@ -116,14 +107,12 @@ in stdenv.mkDerivation rec {
     krb5
     glib gtk dbus_glib
     libXScrnSaver libXcursor mesa
-    pciutils protobuf
+    pciutils protobuf speechd libXdamage
   ] ++ optional gnomeKeyringSupport libgnome_keyring
     ++ optionals gnomeSupport [ gconf libgcrypt ]
     ++ optional enableSELinux libselinux
     ++ optional cupsSupport libgcrypt
     ++ optional pulseSupport pulseaudio
-    ++ optional pre26 libvpx
-    ++ optionals post25 [ speechd libXdamage ]
     ++ optional post26 libXtst;
 
   opensslPatches = optional useOpenSSL openssl.patches;
@@ -138,9 +127,11 @@ in stdenv.mkDerivation rec {
     sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
   '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
-  '' + optionalString post25 ''
+  '' + ''
     sed -i -e 's|/usr/bin/gcc|gcc|' \
-      third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
+      third_party/WebKit/Source/${if post27
+                                  then "core/core.gyp/core.gyp"
+                                  else "WebCore/WebCore.gyp/WebCore.gyp"}
   '';
 
   gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {

pkgs/applications/networking/browsers/chromium/sources.nix

@@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "27.0.1453.47";
+    version = "28.0.1485.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz";
-    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
+    sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9";
   };
   beta = {
-    version = "27.0.1453.47";
+    version = "27.0.1453.65";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz";
-    sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9";
+    sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb";
   };
   stable = {
     version = "26.0.1410.63";

pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix

@@ -47,18 +47,18 @@ stdenv.mkDerivation rec {
   name = "google-talk-plugin-${version}";
   # Use the following to determine the current upstream version:
   # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p'
-  version = "3.10.2.0";
+  version = "3.17.0.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha256 = "0ivjmqrxy3xkwqjp20aqz47smdcdds0i82pfyb5k9jywi8afvchr";
+        sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha256 = "1bac95r9721sc7fsklsmv0lq673901zppdgabjjarpnx8z280jvj";
+        sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc";
       }
     else throw "Google Talk does not support your platform.";
 

pkgs/applications/networking/ftp/filezilla/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite36 }:
+{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite }:
 
 let version = "3.6.0.2"; in
 stdenv.mkDerivation {
@@ -13,11 +13,18 @@ stdenv.mkDerivation {
     "--disable-manualupdatecheck"
   ];
 
-  buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite36 ];
+  buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ];
 
   meta = {
     homepage = "http://filezilla-project.org/";
-    description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more.";
+    description = "Graphical FTP, FTPS and SFTP client";
     license = "GPLv2";
+
+    longDescription = ''
+      FileZilla Client is a free, open source FTP client. It supports
+      FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available
+      under many platforms, binaries for Windows, Linux and Mac OS X are
+      provided.
+    '';
   };
 }

pkgs/applications/video/mkvtoolnix/default.nix

@@ -4,7 +4,6 @@
 , libvorbis
 , file
 , boost
-, lzo
 , xdg_utils
 , expat
 , wxGTK
@@ -16,14 +15,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mkvtoolnix-6.1.0";
+  name = "mkvtoolnix-6.2.0";
 
   src = fetchurl {
     url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
-    sha256 = "01k5al3886cyi97kynx5hf98z5p7mb8vd2m057gbp1k10zblcb9x";
+    sha256 = "0864vmdcnfwk5cb2fv1y60yvp9kqcyaqxwbvy4nsj7bzwv1iqysn";
   };
 
-  buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
+  buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
 
   configureFlags = "--with-boost-libdir=${boost}/lib";
   buildPhase = ''

pkgs/build-support/cabal/default.nix

@@ -96,7 +96,9 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion;
             jailbreak = false;
 
             # pass the '--enable-split-objs' flag to cabal in the configure stage
-            enableSplitObjs = !stdenv.isDarwin;         # http://hackage.haskell.org/trac/ghc/ticket/4013
+            enableSplitObjs = !(  stdenv.isDarwin         # http://hackage.haskell.org/trac/ghc/ticket/4013
+                               || stdenv.lib.versionOlder "7.6.99" ghc.ghcVersion  # -fsplit-ojbs is broken in 7.7 snapshot
+                               );
 
             # pass the '--enable-tests' flag to cabal in the configure stage
             # and run any regression test suites the package might have

pkgs/development/compilers/ghc/head.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.7.20130223";
+  version = "7.7";
   name = "ghc-${version}";
 
   src = fetchurl {
     url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1naw6x1mjij10h9k4biard2pkzi6zml26vv4h34asprv0h6ymdbg";
+    sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
     DYNAMIC_BY_DEFAULT = NO
   '';
 
+  # The tarball errorneously contains an executable that doesn't work in
+  # Nix. Deleting it will cause the program to be re-built locally.
+  postUnpack = ''
+    rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants
+  '';
+
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure

pkgs/development/compilers/go/1.1.nix

@@ -0,0 +1,94 @@
+{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
+
+let
+  loader386 = "${glibc}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc}/lib/ld-linux.so.3";
+in
+
+stdenv.mkDerivation {
+  name = "go-1.1beta2";
+
+  src = fetchurl {
+    url = http://go.googlecode.com/files/go1.1beta2.src.tar.gz;
+    sha1 = "70d7642a6ea065a23458b9ea28e370b19912e52d";
+  };
+
+  buildInputs = [ bison glibc bash makeWrapper ];
+
+  # I'm not sure what go wants from its 'src', but the go installation manual
+  # describes an installation keeping the src.
+  preUnpack = ''
+    mkdir -p $out/share
+    cd $out/share
+  '';
+
+  prePatch = ''
+    cd ..
+    if [ ! -d go ]; then
+      mv * go
+    fi
+    cd go
+
+    patchShebangs ./ # replace /bin/bash
+    # !!! substituteInPlace does not seems to be effective.
+    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
+    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
+    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
+
+    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
+    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
+    #  src/pkg/exec/exec_test.go
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
+    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
+    # Disable a failing icmp test
+    sed -i '/ip[46]:icmp.*nil/d' src/pkg/net/ipraw_test.go
+  '';
+
+  patches = [ ./cacert.patch ];
+
+  GOOS = "linux";
+  GOARCH = if stdenv.system == "i686-linux" then "386"
+          else if stdenv.system == "x86_64-linux" then "amd64"
+          else if stdenv.system == "armv5tel-linux" then "arm"
+          else throw "Unsupported system";
+  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    export GOROOT="$(pwd)/"
+    export GOBIN="$out/bin"
+    export PATH="$GOBIN:$PATH"
+    cd ./src
+    ./all.bash
+    cd -
+
+    # Wrap the tools to define the location of the
+    # libraries.
+    for a in go gofmt godoc; do
+	    wrapProgram "$out/bin/$a" \
+	      --set "GOROOT" $out/share/go \
+        ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
+    done
+
+    # Copy the emacs configuration for Go files.
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp ./misc/emacs/* $out/share/emacs/site-lisp/
+  '';
+
+  meta = {
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/compilers/idris/default.nix

@@ -1,25 +0,0 @@
-{ cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec
-, split, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "idris";
-  version = "0.9.7";
-  sha256 = "0y3rnxbs2s7kxlzlc347vwpylw2p0pdz50zgkyii21gd6klqvd45";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    binary Cabal filepath haskeline mtl parsec split transformers
-  ];
-  buildTools = [ happy ];
-  meta = {
-    homepage = "http://www.idris-lang.org/";
-    description = "Functional Programming Language with Dependent Types";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})

pkgs/development/compilers/pakcs/default.nix

@@ -61,7 +61,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
-    description = "an implementation of the multi-paradigm declarative language Curry";
+    description = "An implementation of the multi-paradigm declarative language Curry";
     license = stdenv.lib.licenses.bsd3;
 
     longDescription = ''
@@ -77,6 +77,6 @@ stdenv.mkDerivation {
     '';
 
     maintainers = [ stdenv.lib.maintainers.kkallio ];
-    platforms = stdenv.lib.platforms.linux;
+    #platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/gnutls/default.nix

@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation (rec {
 
-  name = "gnutls-3.1.3";
+  name = "gnutls-3.1.10";
 
   src = fetchurl {
-    url = "mirror://gnu/gnutls/${name}.tar.xz";
+    url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz";
-    sha256 = "0fff9frz0ycbnppfn0w4a2s9x27k21l4hh9zbax3v7a8cg33dcpw";
+    sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk";
   };
 
   # Note: GMP is a dependency of Nettle, whose public headers include

pkgs/development/libraries/haskell/MonadRandom/default.nix

@@ -1,10 +1,10 @@
-{ cabal, mtl, random }:
+{ cabal, mtl, random, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
-  version = "0.1.8";
+  version = "0.1.9";
-  sha256 = "1zin7qyv86gza60q6a6r8az2dwxm80wh23idvmjapgbjn2kfvfim";
+  sha256 = "1n947650xlz47rj6y6ik2mknyr9smwragjr5akccinmfm1krg6lz";
-  buildDepends = [ mtl random ];
+  buildDepends = [ mtl random transformers ];
   meta = {
     description = "Random-number generation monad";
     license = "unknown";

pkgs/development/libraries/haskell/NumInstances/default.nix

@@ -2,9 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "NumInstances";
-  version = "1.2";
+  version = "1.3";
-  sha256 = "0s26j3h0xg16lcz95qs21iyfnzx8q8w2k2lnq55gakkr1wl4ap59";
+  sha256 = "0w1hls5azsg95c0v510xqgr8hs195y2rxzjc7hpjg8q44d4z78sh";
   meta = {
+    homepage = "https://github.com/conal/NumInstances";
     description = "Instances of numeric classes for functions and tuples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/byteorder/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "byteorder";
-  version = "1.0.3";
+  version = "1.0.4";
-  sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way";
+  sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
   meta = {
     homepage = "http://community.haskell.org/~aslatter/code/byteorder";
     description = "Exposes the native endianness or byte ordering of the system";

pkgs/development/libraries/haskell/crypto-api/default.nix

@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-api";
-  version = "0.11";
+  version = "0.12";
-  sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy";
+  sha256 = "09ra5bz2s5n2zq57n6ylsj7a482bsxpxhybmp04g796h87xgy7xs";
   buildDepends = [ cereal entropy tagged transformers ];
   jailbreak = true;
   meta = {
-    homepage = "http://trac.haskell.org/crypto-api/wiki";
+    homepage = "https://github.com/TomMD/crypto-api";
     description = "A generic interface for cryptographic operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

pkgs/development/libraries/haskell/crypto-conduit/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "crypto-conduit";
-  version = "0.5.1";
+  version = "0.5.2";
-  sha256 = "04z8z7bipa40xnjr8civ1sj3df2iyvlv929ibkrdqv87gj0qv2dp";
+  sha256 = "0ncqwr2a9nxl6q7qys9gb5db62lx622g5db1xhpfni045x324kbz";
   buildDepends = [ cereal conduit cryptoApi transformers ];
   testDepends = [
     cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec

pkgs/development/libraries/haskell/diagrams/diagrams.nix

@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];
   noHaddock = true;
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative vector graphics";

pkgs/development/libraries/haskell/diagrams/lib.nix

@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     active colour dataDefault diagramsCore monoidExtras newtype
     NumInstances semigroups vectorSpace
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";

pkgs/development/libraries/haskell/fsnotify/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fsnotify";
-  version = "0.0.8";
+  version = "0.0.11";
-  sha256 = "05vfiddp5m28rm02ci7fcfg1zgw5ydj084173mpp1w124bfqf940";
+  sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
   buildDepends = [ hinotify systemFileio systemFilepath text time ];
   testDepends = [
     Cabal Glob hinotify hspec QuickCheck random systemFileio
@@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
   ];
   doCheck = false;
   meta = {
-    description = "Cross platform library for file creation, modification, and deletion notification";
+    description = "Cross platform library for file change notification";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.simons ];

pkgs/development/libraries/haskell/ghc-heap-view/default.nix

@@ -1,10 +1,10 @@
-{ cabal, transformers }:
+{ cabal, binary, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-heap-view";
-  version = "0.4.2.0";
+  version = "0.5.0.1";
-  sha256 = "0c9yz47j0ddy0l04dabglc99hl7n9wwnz4xj9r8ljafag6l221gp";
+  sha256 = "1zqzv6r4nkzam51bb6pp2i1kkzhx5mnaqcn8wzr0hxbi5lc1088h";
-  buildDepends = [ transformers ];
+  buildDepends = [ binary transformers ];
   meta = {
     description = "Extract the heap representation of Haskell values and thunks";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/github/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.6.0";
+  version = "0.7.0";
-  sha256 = "1bg443rhh57p10q9dwx4aa2964qwg00swmdlvh1r72c343lrv1gj";
+  sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
     httpConduit httpTypes network text time unorderedContainers vector

pkgs/development/libraries/haskell/http-reverse-proxy/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.1.1.4";
+  version = "0.1.1.6";
-  sha256 = "0j77hp1ddbxrsv65xf6kqbl8jnvl6qzx98p0lg73j7s76j7vg9cd";
+  sha256 = "0fh61rm3k00shzis2dkgifnkfn78vx124dzmmdzlf550kjmhxb9l";
   buildDepends = [
     blazeBuilder caseInsensitive classyPrelude conduit dataDefault
     httpConduit httpTypes liftedBase monadControl network

pkgs/development/libraries/haskell/io-choice/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-choice";
-  version = "0.0.2";
+  version = "0.0.3";
-  sha256 = "0kxn357cc31gvaajg41h6xwpivq049dl1zd551xfvrvzndvy061f";
+  sha256 = "1dfl6n3r8hifl9rli2qvwgichz3h7nxq0v6m1k29vb8dv35ldsd8";
   buildDepends = [
     liftedBase monadControl transformers transformersBase
   ];

pkgs/development/libraries/haskell/lifted-base/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.0.3";
+  version = "0.2.0.4";
-  sha256 = "1sfrak4jf3mvns9y6iadyhj8zvy4wyrqiaxihrxv2qby14c45psx";
+  sha256 = "0ljqa56gd4760x7x32v75n6a4h8f03p2g4xajaj3917w4w2rf5rp";
   buildDepends = [
     baseUnicodeSymbols monadControl transformersBase
   ];

pkgs/development/libraries/haskell/mainland-pretty/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mainland-pretty";
-  version = "0.2.5";
+  version = "0.2.6";
-  sha256 = "0h3q7xw69dc0lcqwlacsnv36dlbj0sfgv5imjlqrixy6m5cniq9x";
+  sha256 = "1mjw79jg0vq8qvgvjdinidw1pvfj3mych3z0f6g031vmqz7fqvzy";
   buildDepends = [ srcloc text ];
   meta = {
     homepage = "http://www.eecs.harvard.edu/~mainland/";

pkgs/development/libraries/haskell/monad-control/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.2";
+  version = "0.3.2.1";
-  sha256 = "1gw1g89cjr993kcxjd1lvj94klrb8hsxn0yzyl1gmfk4273z39pa";
+  sha256 = "17wfdg3a2kkx1jwh7gfgbyx4351b420krsf8syb8l9xrl9gdz5a3";
   buildDepends = [
     baseUnicodeSymbols transformers transformersBase
   ];

pkgs/development/libraries/haskell/resourcet/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.4.7";
+  version = "0.4.7.1";
-  sha256 = "0cmh9hhiy0qksigm2rvycyaw58r8357fl6xhv8x465ykw1va0by8";
+  sha256 = "1x9njf5amxv04fvn7fsgpagvzl09sl6bnnx686i554frg66b2azh";
   buildDepends = [
     liftedBase mmorph monadControl mtl transformers transformersBase
   ];

pkgs/development/libraries/haskell/shakespeare-css/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.3";
+  version = "1.0.5.1";
-  sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz";
+  sha256 = "06x57cm9ni7cgdizdwzqzpqdmgzhchax7c4mbqvk3ymgf3lybrss";
   buildDepends = [ parsec shakespeare text transformers ];
   testDepends = [ hspec HUnit shakespeare text ];
   meta = {

pkgs/development/libraries/haskell/shakespeare-js/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.1.3";
+  version = "1.1.4";
-  sha256 = "091yygp2gfp290m76iwpjddzgn7qjq1h5f8ma8sd3lvy6pv2pzcz";
+  sha256 = "05hnqpg1icf6akvchhiam8sd2xkfiyvbwq504gnys55rxgjabfy3";
   buildDepends = [ aeson shakespeare text ];
   testDepends = [ aeson hspec HUnit shakespeare text ];
   meta = {

pkgs/development/libraries/haskell/shakespeare/default.nix

@@ -1,15 +1,12 @@
-{ cabal, fetchurl, hspec, parsec, text }:
+{ cabal, hspec, parsec, systemFileio, systemFilepath, text, time }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.0.4";
+  version = "1.0.5";
-  sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb";
+  sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf";
-  buildDepends = [ parsec text ];
+  buildDepends = [ parsec systemFileio systemFilepath text time ];
-  testDepends = [ hspec parsec text ];
+  testDepends = [
-  patchFlags = "-p2";
+    hspec parsec systemFileio systemFilepath text time
-  patches = [ (fetchurl { url = "https://github.com/yesodweb/shakespeare/pull/102.patch";
-                          sha256 = "02fp87sw7k8zyn8kgmjg8974gi7pp5fyvb4f84i983qycmlmh8xq";
-                        })
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";

pkgs/development/libraries/haskell/skein/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "1.0.1";
+  version = "1.0.2";
-  sha256 = "1mvyq6wp03fs6sjppgalaacargvi69yf5d59k473pgr1g89v4ni1";
+  sha256 = "1wzy586lcr0pxsdf4lvqhbzq8bsm26gm71jlmv64i22f99n5s9h2";
   buildDepends = [ cereal cryptoApi tagged ];
   testDepends = [ cereal cryptoApi filepath hspec tagged ];
   jailbreak = true;

pkgs/development/libraries/haskell/unordered-containers/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unordered-containers";
-  version = "0.2.3.0";
+  version = "0.2.3.1";
-  sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd";
+  sha256 = "10wz5y42r9b2ym7vl5sqrcawyjixmhy370h0kzpvczs8mlzvrlx8";
   buildDepends = [ deepseq hashable ];
   testDepends = [
     ChasingBottoms hashable HUnit QuickCheck testFramework

pkgs/development/libraries/haskell/uuid/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uuid";
-  version = "1.2.10";
+  version = "1.2.11";
-  sha256 = "17njmmh190pg9bpb8iaw2kniyn7z7j70mzdmxr9h29kydl1xmky6";
+  sha256 = "0fr91w8jahb7ryhgl8dm6w8jg9sykn3m1jnfvyrfdpkpwkc0kpxx";
   buildDepends = [ binary cryptohash maccatcher random time ];
   testDepends = [
     criterion deepseq HUnit mersenneRandomPure64 QuickCheck random

pkgs/development/libraries/haskell/warp/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.3.8";
+  version = "1.3.8.1";
-  sha256 = "0lpyrdwgsaxzds6qrh0drp0r90x1va4d7z2n65xb0rhkslr3sk3l";
+  sha256 = "07kzfv8j9x6qhl9kjhyl6gricq88y6ys48vml4chqnd8sg9vki3x";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
     httpTypes liftedBase network networkConduit simpleSendfile

pkgs/development/libraries/haskell/yesod-static/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.1.2.2";
+  version = "1.1.2.3";
-  sha256 = "1z1afpr9xbclpwswlbys7f7w8761vvr06hxhqhnqfzf4ky8g3671";
+  sha256 = "15wk7kpr5xdxia07wyx7msfdlyafqn2pkkrzzdfqvij972n17xmh";
   buildDepends = [
     base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
     httpTypes systemFilepath text transformers unixCompat wai

pkgs/development/libraries/haskell/yesod/default.nix

@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "1.1.9.2";
+  version = "1.1.9.3";
-  sha256 = "1rv9mk842b9qwdzal9y5cn2z5z2rl6490600jg1xbsg0x0nl7hdj";
+  sha256 = "16w96lyd0z9slhzggbvmb23yfr3jkwywpmp15kbilwn7ghjlkm41";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/javascript/jquery-ui/default.nix

@@ -1,15 +1,13 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "jquery-ui-1.8.10";
+  name = "jquery-ui-1.10.2";
 
   src = fetchurl {
     url = "http://jqueryui.com/download/${name}.custom.zip";
-    sha256 = "0yglab9zmxr1il2rmxxd7gycpfaavgpi03h8nc5b2yx2kz80jlik";
+    sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl";
   };
 
-  sourceRoot = ".";
-
   buildInputs = [ unzip ];
 
   installPhase =

pkgs/development/libraries/sqlite/3.7.14.nix

@@ -3,18 +3,19 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.6.23.1";
+  name = "sqlite-3.7.14.1";
 
   src = fetchurl {
-    url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz";
+    url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz;
-    sha256 = "0n1maahlqxk7p6kmsv0v2afy6qbv15n85mgkr4ylbf3ghcjdg06h";
+    sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc";
   };
 
   buildInputs = [ readline ncurses ];
+
   configureFlags = "--enable-threadsafe";
 
-  NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1";
+  CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
-  NIX_CFLAGS_LINK = if readline != null then "-lncurses" else "";
+  LDFLAGS = if readline != null then "-lncurses" else "";
 
   meta = {
     homepage = http://www.sqlite.org/;

pkgs/development/libraries/sqlite/3.7.16.nix

@@ -3,11 +3,11 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.7.16.1";
+  name = "sqlite-3.7.16.2";
 
   src = fetchurl {
-    url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz;
+    url = http://www.sqlite.org/2013/sqlite-autoconf-3071602.tar.gz;
-    sha1 = "b0d9b3e2ca3c50f72e5921e9532130787871b7ae";
+    sha1 = "85bf857cf86f34831d55d7ba97606dba581b8d62";
   };
 
   buildInputs = [ readline ncurses ];

pkgs/development/tools/misc/gdb/default.nix

@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.5.1";
+  basename = "gdb-7.6";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.bz2";
-    sha256 = "084xs90545an51biyy4qd53hsw6p1k6arviq2wlz1a4z526q02q7";
+    md5 = "fda57170e4d11cdde74259ca575412a8";
   };
 
   # I think python is not a native input, but I leave it

pkgs/lib/maintainers.nix

@@ -30,7 +30,7 @@
   neznalek = "Vladimír Čunát <vcunat@gmail.com>";
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";
-  phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
+  phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   qknight = "Joachim Schiele <js@lastlog.de>";

pkgs/os-specific/linux/kernel/linux-3.0.nix

@@ -231,7 +231,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.0.74";
+    version = "3.0.75";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -239,7 +239,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-      sha256 = "016a16sfvdkjgzwndr985mgqny7cl3rbyz8mrnsh9l55czckiq5x";
+      sha256 = "08b4ibyxihsy36n0grg08iywxi23f29s15l3h0sa1dssxxhr1kf9";
     };
 
     config = configWithPlatform stdenv.platform;

pkgs/os-specific/linux/kernel/linux-3.2.nix

@@ -240,7 +240,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.2.43";
+    version = "3.2.44";
 
     modDirVersion = version;
 
@@ -250,7 +250,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz";
-      sha256 = "0cg88mdlqs7zj2ndj4i9hmvmxasmgv2fqlpzr87qm7bqkmmb6p58";
+      sha256 = "1rlv4j0y75ymj74vwdd2m0z3jzn5lxk1g4cliqmambhycg5jxlb0";
     };
 
     config = configWithPlatform stdenv.platform;

pkgs/os-specific/linux/kernel/linux-3.4.nix

@@ -245,7 +245,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.4.41";
+    version = "3.4.42";
     testing = false;
 
     preConfigure = ''
@@ -254,7 +254,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "18zj4biji3vmy7d1gg6lwfpc77856nsfalfpc00vk3pis6yd2k22";
+      sha256 = "189rpb5jd073x0fhkh1yqmgg759lpmdj0ldysq57sibs4prb0km2";
     };
 
     config = configWithPlatform stdenv.platform;

pkgs/os-specific/linux/kernel/linux-3.8.nix

@@ -252,7 +252,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.8.8";
+    version = "3.8.10";
     testing = false;
 
     preConfigure = ''
@@ -261,7 +261,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0idybkn574hkb8xp2zs3ahkvmy98qwx4599lanskzq2nfrd065kc";
+      sha256 = "0nhjprr1yvkb9fvyjxxdds0j71vidpbqqnmrf0cym3a4l3fxqj5p";
     };
 
     config = configWithPlatform stdenv.platform;

pkgs/os-specific/linux/kernel/linux-3.9.nix

@@ -252,9 +252,9 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.9-rc7";
+    version = "3.9";
-    modDirVersion = "3.9.0-rc7";
+    modDirVersion = "3.9.0";
-    testing = true;
+    testing = false;
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -262,7 +262,7 @@ import ./generic.nix (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
-      sha256 = "0bl58byszb3pg5dplzc19kgx7gif5cnbfykqqp1jmskpxzf1splx";
+      sha256 = "0ha5ym9ssvz14kb8w6zksk4s867mmd07dkfp5kg7iisxxrj3xg30";
     };
 
     config = configWithPlatform stdenv.platform;

pkgs/os-specific/linux/systemd/default.nix

@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     ''
       # FIXME: patch this in systemd properly (and send upstream).
       # FIXME: use sulogin from util-linux once updated.
-      for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in; do
+      for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c; do
         test -e $i
         substituteInPlace $i \
           --replace /bin/mount ${utillinux}/bin/mount \
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
           --replace /sbin/swapoff ${utillinux}/sbin/swapoff \
           --replace /sbin/fsck ${utillinux}/sbin/fsck \
           --replace /bin/echo ${coreutils}/bin/echo \
+          --replace /bin/cat ${coreutils}/bin/cat \
           --replace /sbin/sulogin ${sysvtools}/sbin/sulogin
       done
 

pkgs/servers/http/lighttpd/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file }:
+{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file, openssl }:
 
 stdenv.mkDerivation {
   name = "lighttpd-1.4.32";
@@ -8,7 +8,9 @@ stdenv.mkDerivation {
     sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k";
   };
 
-  buildInputs = [ pcre libxml2 zlib attr bzip2 which file ];
+  buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ];
+
+  configureFlags = "--with-openssl --with-openssl-libs=${openssl}";
 
   preConfigure = ''
     sed -i "s:/usr/bin/file:${file}/bin/file:g" configure

pkgs/servers/sql/virtuoso/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-6.1.5";
+  name = "virtuoso-opensource-6.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "02aax76f51ya5slp1slv4r1ihcb7zpb040n33b581g8n1ppgj2ps";
+    sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];

pkgs/tools/backup/bup/default.nix

@@ -52,5 +52,8 @@ stdenv.mkDerivation {
       Highly efficient file backup system based on the git packfile format.
       Capable of doing *fast* incremental backups of virtual machine images.
     '';
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/networking/dhcpcd/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-5.6.7";
+  name = "dhcpcd-5.6.8";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "144cjcjnr85jiwbw5iv3hvn97sc0z25ya3r31cn0wv11jrsw6b0h";
+    sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3";
   };
 
   configureFlags = "--sysconfdir=/etc";

pkgs/tools/networking/p2p/tahoe-lafs/default.nix

@@ -8,15 +8,15 @@
 # some loss of functionality because of it.
 
 let
-  name = "tahoe-lafs-1.8.3";
+  name = "tahoe-lafs-1.9.2";
 in
 buildPythonPackage {
   inherit name;
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.8.3.tar.bz2";
+    url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.9.2.tar.bz2";
-    sha256 = "00pm7fvwci5ncg2jhsqsl9r79kn495yni8nmr7p5i98f3siwvjd8";
+    sha256 = "0111gmavyrnglx10kj8z7wm7y97fyg9isv71c0gx9kq4c03knxq4";
   };
 
   # The patch doesn't apply cleanly to the current version.
@@ -37,7 +37,7 @@ buildPythonPackage {
         -es"|cmd = find_exe.find_exe('twistd')|cmd = ['${twisted}/bin/twistd']|g"
 
     sed -i "src/allmydata/util/iputil.py" \
-        -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/sbin/ifconfig'|g"
+        -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g"
 
     # Chroots don't have /etc/hosts and /etc/resolv.conf, so work around
     # that.

pkgs/tools/networking/reaver-wps/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, libpcap, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "reaver-wps-1.4";
+
+  src = fetchurl {
+    url = http://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz;
+    sha256 = "0bdjai4p8xbsw8zdkkk43rgsif79x0nyx4djpyv0mzh59850blxd";
+  };
+
+  buildInputs = [ libpcap sqlite ];
+
+  prePatch = ''
+    cd src
+  '';
+
+  preInstall = ''
+    ensureDir $out/bin
+  '';
+
+  meta = {
+    description = "Brute force attack against Wifi Protected Setup";
+    homepage = http://code.google.com/p/reaver-wps;
+    license = "GPLv2+";
+  };
+}

pkgs/tools/package-management/nix/unstable.nix

@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.5.2pre3082_2398417";
+  name = "nix-1.5.2pre3091_772b709";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/4480483/download/5/${name}.tar.xz";
+    url = "http://hydra.nixos.org/build/4796316/download/5/${name}.tar.xz";
-    sha256 = "efea03fd9e15f52564ecfe6942bf9e8a757ef2e83b6ad9832f214342b2cbba83";
+    sha256 = "f1acf131842d9604d886d5f98aaa4739bea63536023d7287ce48613c38d49fbd";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

pkgs/top-level/all-packages.nix

@@ -1483,6 +1483,8 @@ let
 
   rtmpdump = callPackage ../tools/video/rtmpdump { };
 
+  reaverwps = callPackage ../tools/networking/reaver-wps {};
+
   recutils = callPackage ../tools/misc/recutils { };
 
   recoll = callPackage ../applications/search/recoll { };
@@ -2504,6 +2506,8 @@ let
 
   go = callPackage ../development/compilers/go { };
 
+  go_1_1 = lowPrio (callPackage ../development/compilers/go/1.1.nix { });
+
   gprolog = callPackage ../development/compilers/gprolog { };
 
   gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
@@ -5006,21 +5010,23 @@ let
 
   srtp = callPackage ../development/libraries/srtp {};
 
-  sqlite = lowPrio (callPackage ../development/libraries/sqlite {
+  sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix {
     readline = null;
     ncurses = null;
   });
 
-  sqlite36 = callPackage ../development/libraries/sqlite/3.6.x.nix {
+  sqlite_3_7_14 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.nix {
     readline = null;
     ncurses = null;
-  };
+  });
+
+  sqlite = sqlite_3_7_16;
 
   sqliteInteractive = appendToName "interactive" (sqlite.override {
     inherit readline ncurses;
   });
 
-  sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/full.nix {
+  sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/3.7.9-full.nix {
     inherit readline ncurses;
   });
 
@@ -5975,8 +5981,7 @@ let
       ];
   };
 
-  # low-priority because it is RC
+  linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
-  linux_3_9 = lowPrio (makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
     inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
     kernelPatches =
       [
@@ -5986,7 +5991,7 @@ let
         kernelPatches.mips_fpu_sigill
         kernelPatches.mips_ext3_n32
       ];
-  });
+  };
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
@@ -6091,6 +6096,7 @@ let
     virtualbox = callPackage ../applications/virtualization/virtualbox {
       stdenv = stdenv_32bit;
       inherit (gnome) libIDL;
+      enableExtensionPack = config.virtualbox.enableExtensionPack or false;
     };
 
     virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
@@ -6106,8 +6112,9 @@ let
   linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
   linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
   linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
+  linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9);
   # Update this when adding a new version!
-  linuxPackages_latest = pkgs.linuxPackages_3_8;
+  linuxPackages_latest = pkgs.linuxPackages_3_9;
 
   # The current default kernel / kernel modules.
   linux = linuxPackages.kernel;
@@ -7818,6 +7825,8 @@ let
 
   st = callPackage ../applications/misc/st { };
 
+  bittorrentSync = callPackage ../applications/networking/bittorrentsync { };
+
   dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };

pkgs/top-level/haskell-packages.nix

@@ -2060,8 +2060,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   flapjax = callPackage ../development/compilers/flapjax {};
 
-  idris = callPackage ../development/compilers/idris {};
-
   pakcs = callPackage ../development/compilers/pakcs {};
 
   # Development tools.

pkgs/top-level/perl-packages.nix

@@ -1532,10 +1532,10 @@ rec {
   };
 
   DBI = buildPerlPackage {
-    name = "DBI-1.616";
+    name = "DBI-1.625";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.616.tar.gz;
+      url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.625.tar.gz;
-      sha256 = "0m6hk66xprjl314d5c665hnd1vch9a0b9y6ywvmf04kdqj33kkk0";
+      sha256 = "1rl1bnirf1hshc0z04vk41qplx2ixzciabvwy50a1sld7vs46q4w";
     };
     meta = {
       homepage = http://dbi.perl.org/;

pkgs/top-level/python-packages.nix

@@ -1476,6 +1476,22 @@ pythonPackages = python.modules // rec {
     };
   };
 
+  doxypy = buildPythonPackage rec {
+    name = "doxypy-0.4.2";
+
+    src = fetchurl {
+      url = "http://code.foosel.org/files/${name}.tar.gz";
+      sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g";
+    };
+
+    meta = {
+      homepage = http://code.foosel.org/doxypy;
+      description = "An input filter for Doxygen";
+    };
+
+    doCheck = false;
+  };
+
 
   dtopt = buildPythonPackage rec {
     name = "dtopt-0.1";
@@ -1645,11 +1661,11 @@ pythonPackages = python.modules // rec {
 
 
   foolscap = buildPythonPackage (rec {
-    name = "foolscap-0.6.1";
+    name = "foolscap-0.6.4";
 
     src = fetchurl {
       url = "http://foolscap.lothar.com/releases/${name}.tar.gz";
-      sha256 = "8b3e4fc678c5c41483b3130666583a1c3909713adcd325204daded7b67171ed5";
+      sha256 = "16cddyk5is0gjfn0ia5n2l4lhdzvbjzlx6sfpy7ddjd3d3fq7ckl";
     };
 
     propagatedBuildInputs = [ twisted pkgs.pyopenssl ];

pkgs/top-level/release-haskell.nix

@@ -57,8 +57,8 @@ mapHaskellTestOn {
   AspectAG = default;
   async = default ++ latest;
   attempt = default;
-  attoparsecEnumerator = default;
   attoparsec = default;
+  attoparsecEnumerator = default;
   authenticate = default;
   base64Bytestring = default;
   baseUnicodeSymbols = default;
@@ -67,8 +67,8 @@ mapHaskellTestOn {
   binaryShared = default;
   bitmap = default;
   bktrees = default;
-  blazeBuilderEnumerator = default;
   blazeBuilder = default;
+  blazeBuilderEnumerator = default;
   blazeHtml = default;
   blazeTextual = default;
   bloomfilter = default;
@@ -153,11 +153,12 @@ mapHaskellTestOn {
   filestore = default;
   fingertree = default;
   flexibleDefaults = default;
+  fsnotify = [ ghc704 ghc742 ghc763 ];
   funcmp = all;
   gamma = default;
   gdiff = default;
-  ghcEvents = default;
   ghc = default;
+  ghcEvents = default;
   ghcMod = default ++ latest;
   ghcMtl = default;
   ghcPaths = default;
@@ -187,8 +188,8 @@ mapHaskellTestOn {
   haskeline = default;
   haskellLexer = default;
   haskellPlatform = allBut ghc763;
-  haskellSrcExts = default;
   haskellSrc = all;
+  haskellSrcExts = default;
   haskellSrcMeta = default;
   HaXml = default;
   haxr = default;
@@ -224,10 +225,10 @@ mapHaskellTestOn {
   HStringTemplate = default ++ latest;
   hsyslog = all;
   html = all;
+  HTTP = all;
   httpConduit = default;
   httpDate = default;
   httpdShed = default;
-  HTTP = all;
   httpTypes = default;
   HUnit = all;
   hxt = default;
@@ -313,8 +314,8 @@ mapHaskellTestOn {
   pwstoreFast = default;
   QuickCheck2 = default;
   QuickCheck = all;
-  randomFu = default;
   random = default ++ latest;
+  randomFu = default;
   randomShuffle = default;
   randomSource = default;
   RangedSets = default;
@@ -378,11 +379,11 @@ mapHaskellTestOn {
   text = all;
   thLift = default;
   timeplot = default;
-  tlsExtra = default;
   tls = default;
+  tlsExtra = default;
+  transformers = all;
   transformersBase = default;
   transformersCompat = default;
-  transformers = all;
   tuple = default;
   typeLlevelNaturalNumber = default;
   uniplate = default;
@@ -406,16 +407,16 @@ mapHaskellTestOn {
   vectorSpace = default;
   vty = default;
   waiAppStatic = default;
-  waiExtra = default;
   wai = default;
+  waiExtra = default;
   waiLogger = default;
   warp = default;
-  wlPprintExtras = default;
   wlPprint = default ++ latest;
+  wlPprintExtras = default;
   wlPprintTerminfo = default;
   wxcore = default;
-  wxdirect = default;
   wx = default;
+  wxdirect = default;
   X11 = default;
   xhtml = all;
   xmlConduit = default;
@@ -424,14 +425,14 @@ mapHaskellTestOn {
   xmlTypes = default;
   xmobar = default ++ latest;
   xmonadContrib = default ++ latest;
-  xmonadExtras = default ++ latest;
   xmonad = default ++ latest;
+  xmonadExtras = default ++ latest;
   xssSanitize = default;
   yesodAuth = default;
   yesodCore = default;
+  yesod = default;
   yesodDefault = default;
   yesodForm = default;
-  yesod = default;
   yesodJson = default;
   yesodPersistent = default;
   yesodStatic = default;
@@ -439,8 +440,8 @@ mapHaskellTestOn {
   zeromqHaskell = default;
   zipArchive = default;
   zipper = default;
+  zlib = all;
   zlibBindings = default;
   zlibEnum = default;
-  zlib = all;
 
 }