Merge branch 'master' into x-updates

pkgs/applications/version-management/git-and-tools/default.nix

@@ -43,10 +43,13 @@ rec {
   });
 
   gitAnnex = lib.makeOverridable (import ./git-annex) {
-    inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh;
+    inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh;
-    inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
+    inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP
-      HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
+      blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl
-      QuickCheck bloomfilter editDistance stm hinotify;
+      network pcreLight QuickCheck SHA stm utf8String networkInfo dbus
+      clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet
+      httpTypes networkMulticast text time transformers transformersBase wai
+      waiLogger warp yesod yesodDefault yesodStatic testpack;
   };
 
   qgit = import ./qgit {

pkgs/applications/version-management/git-and-tools/git-annex/default.nix

@@ -1,27 +1,35 @@
-{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
+{ stdenv, ghc, fetchurl, perl, coreutils, git, libuuid, rsync
-, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
+, findutils, curl, ikiwiki, which, openssh
-, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
+, blazeBuilder, blazeHtml, bloomfilter, caseInsensitive
-, IfElse, bloomfilter, editDistance, openssh, stm, hinotify
+, clientsession, cryptoApi, dataDefault, dataenc, dbus
+, editDistance, extensibleExceptions, filepath, hamlet, hinotify
+, hS3, hslogger, HTTP, httpTypes, IfElse, json, liftedBase
+, MissingH, monadControl, mtl, network, networkInfo
+, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
+, transformers, transformersBase, utf8String, wai, waiLogger, warp
+, yesod, yesodDefault, yesodStatic, testpack
 }:
 
 let
-  version = "3.20120825";
+  version = "3.20121010";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
-    sha256 = "edffe6a99d07599f62d4d5f6823de8a830abe8977c7671fd6eb21aeaebc0b8d0";
+    sha256 = "4db543af6cbcb2d92c808c01969425d1fd1a916b37386dcdfe1a3101876ccde2";
     name = "git-annex-${version}.tar.gz";
   };
 
-  buildInputs = [
+  buildInputs = [ ghc git libuuid rsync findutils curl ikiwiki which
-    curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
+    openssh blazeBuilder blazeHtml bloomfilter caseInsensitive
-    libuuid MissingH monadControl mtl network pcreLight perl QuickCheck
+    clientsession cryptoApi dataDefault dataenc dbus editDistance
-    rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
+    extensibleExceptions filepath hamlet hinotify hS3 hslogger HTTP
-    editDistance openssh stm hinotify
+    httpTypes IfElse json liftedBase MissingH monadControl mtl network
-  ];
+    networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
+    transformers transformersBase utf8String wai waiLogger warp yesod
+    yesodDefault yesodStatic testpack ];
 
   checkTarget = "test";
   doCheck = true;
@@ -29,7 +37,7 @@ stdenv.mkDerivation {
   # The 'add_url' test fails because it attempts to use the network.
   preConfigure = ''
     makeFlagsArray=( PREFIX=$out )
-    sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
+    sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man
     sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
   '';
 

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

@@ -0,0 +1,19 @@
+{ cabal, cereal, libxmlSax, network, parsec, random, text
+, transformers, vector, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+  pname = "dbus";
+  version = "0.10.1";
+  sha256 = "180923lp09pwcvxffxyq753mq7zp7dyxgaj3h13wfsrhfia0awz8";
+  buildDepends = [
+    cereal libxmlSax network parsec random text transformers vector
+    xmlTypes
+  ];
+  meta = {
+    homepage = "https://john-millikin.com/software/haskell-dbus/";
+    description = "A client library for the D-Bus IPC system";
+    license = self.stdenv.lib.licenses.gpl3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/digestive-functors-snap/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-snap";
-  version = "0.5.0.0";
+  version = "0.5.0.1";
-  sha256 = "01lbd42rsryzqzra8ax22iw6c9fyv5az8q7dkdi6yyfxdq976l0x";
+  sha256 = "149c01vxzlwskqsncc5l26mk67icmsq2zbav2asjxpp6z8b53i3b";
   buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";

pkgs/development/libraries/haskell/digestive-functors/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors";
-  version = "0.5.0.2";
+  version = "0.5.0.3";
-  sha256 = "1phakcljl6ri2p9lfzjnn001jw0inyxa5zd7lp2k9lhq1yq0byb0";
+  sha256 = "176wpnwg4zpfwphl0ifb3zdm0dhw5xyd3vr81rc98s4db5y9csl0";
   buildDepends = [ mtl text ];
   meta = {
     homepage = "http://github.com/jaspervdj/digestive-functors";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.3.1.0";
+  version = "9.3.1.1";
-  sha256 = "0nv7d7ffwq81671c7gyzaqx7xgrgs42svbq5xraij4jbq5406719";
+  sha256 = "1x0z85vx49s2b9bgjm14c2152cwr0vzf02rlxrla5dj5g565985y";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
     hxtUnicode mtl network parsec

pkgs/development/libraries/haskell/language-c-quote/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-quote";
-  version = "0.4.2";
+  version = "0.4.3";
-  sha256 = "0l69kn8flx36z3cl9ckdls8w2sq8361w6abmi3gsa80l8yg3cpl4";
+  sha256 = "13xpmj3jrqkcgilkh4p8ycxhlk5yvfsisx4c1ax7n7aafg1n7phf";
   buildDepends = [
     exceptionMtl exceptionTransformers filepath haskellSrcMeta
     mainlandPretty mtl srcloc syb symbol

pkgs/development/libraries/haskell/language-javascript/default.nix

@@ -1,11 +1,11 @@
-{ cabal, alex, blazeBuilder, happy, mtl, utf8Light, utf8String }:
+{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.5";
+  version = "0.5.6";
-  sha256 = "1p02n6rh98nvkh7g5kj18ggcnyvds8lqbgjwgzm83bnd5ayizrw7";
+  sha256 = "1a1nki2z7x0rna5jg6g0gqnipvd115k4xgagg6prrvj284ml44wd";
   buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
-  buildTools = [ alex happy ];
+  buildTools = [ happy ];
   meta = {
     homepage = "http://github.com/alanz/language-javascript";
     description = "Parser for JavaScript";

pkgs/development/libraries/haskell/libxml-sax/default.nix

@@ -0,0 +1,16 @@
+{ cabal, libxml2, text, xmlTypes }:
+
+cabal.mkDerivation (self: {
+  pname = "libxml-sax";
+  version = "0.7.3";
+  sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r";
+  buildDepends = [ text xmlTypes ];
+  extraLibraries = [ libxml2 ];
+  pkgconfigDepends = [ libxml2 ];
+  meta = {
+    homepage = "https://john-millikin.com/software/haskell-libxml/";
+    description = "Bindings for the libXML2 SAX interface";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/network-info/default.nix

@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "network-info";
+  version = "0.2.0.2";
+  sha256 = "132cna6dc8azpll3rm2y4wv6sdcavwjq3x9f8m4p2952vr53bw3m";
+  meta = {
+    homepage = "http://github.com/jystic/network-info";
+    description = "Access the local computer's basic network configuration";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/tools/haskell/cabal2nix/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.39";
+  version = "1.40";
-  sha256 = "0q2kgzjbcrqxml12hncsrkjdwjiq52dp00v6i3qdgiyj460iy60d";
+  sha256 = "0finmky9lyzg5gs0y95fb0gmzraszljv7l5271185jmhky4wppim";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

pkgs/shells/bash-completion/default.nix

@@ -11,11 +11,6 @@ stdenv.mkDerivation {
     sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804";
   };
 
-  postInstall = ''
-    sed -i "$out/share/bash-completion/bash_completion" \
-        -e 's|: .{BASH_COMPLETION_COMPAT_DIR:=.*}|BASH_COMPLETION_COMPAT_DIR="$HOME/.nix-profile/etc/bash_completion.d"|'
-  '';
-
   doCheck = true;
 
   meta = {

pkgs/top-level/haskell-packages.nix

@@ -660,6 +660,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   datetime = callPackage ../development/libraries/haskell/datetime {};
 
+  dbus = callPackage ../development/libraries/haskell/dbus {};
+
   deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {};
   deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {};
   deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {};
@@ -1089,6 +1091,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   liblastfm = callPackage ../development/libraries/haskell/liblastfm {};
 
+  libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {};
+
   liftedBase = callPackage ../development/libraries/haskell/lifted-base {};
 
   ListLike = callPackage ../development/libraries/haskell/ListLike {};
@@ -1189,6 +1193,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
 
+  networkInfo = callPackage ../development/libraries/haskell/network-info {};
+
   networkMulticast = callPackage ../development/libraries/haskell/network-multicast {};
 
   networkTransport = callPackage ../development/libraries/haskell/network-transport {};