gajim: Revert update to latest mercurial branch.

This reverts commit 83ba20511bf553d2dd395a6fe4af73fc9d86d57c.

We now have nbxmpp in upstream <nixpkgs>, so we no longer need it in our
own overrides and there was a new tarball release issued upstream just
one day after we did that override, so let's move over to using this one
instead.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Conflicts:
    overrides/default.nix
    pkgs/gajim/0.16-pre.nix
    pkgs/nbxmpp/default.nix

1 files changed, 0 insertions, 4 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1743fd54..be8953d2 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -7,13 +7,9 @@ let
   self = {
     axbo = callPackage ./axbo { };
     blop = callPackage ./blop { };
-    gajim = callPackage ./gajim/0.16-pre.nix {
-      inherit (pkgs.xlibs) libX11;
-    };
     libCMT = callPackage ./libcmt { };
     librxtx_java = callPackage ./librxtx-java { };
     lockdev = callPackage ./lockdev { };
-    nbxmpp = callPackage ./nbxmpp { };
     pvolctrl = callPackage ./pvolctrl { };
     sidplayfp = callPackage ./sidplayfp { };
     tkabber_urgent_plugin = callPackage ./tkabber-urgent-plugin { };