Merge branch 'master' of git://github.com/esterlus/nixpkgs

added telegram-cli as instant-messenger application

pkgs/applications/networking/instant-messengers/telegram-cli/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "telegram-cli";
+
+  src = fetchgit {
+    url = "https://github.com/vysheng/tg.git";
+    rev = "ac6079a00ac66bb37a3179a82af130b41ec39bc9";
+    sha256 = "1rpwnyzmqk7p97n5pd00m5c6rypc39mb3hs94qxxrdcpwpgcb73q";
+  };
+
+  buildInputs = [ libconfig lua5_2 openssl readline zlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ./telegram $out/bin/telegram-wo-key
+    cp ./tg.pub $out/
+    cat > $out/bin/telegram <<EOF
+    #!/usr/bin/env bash
+    $out/bin/telegram-wo-key -k $out/tg.pub
+    EOF
+    chmod +x $out/bin/telegram
+  '';
+
+  meta = {
+    description = "Command-line interface for Telegram messenger";
+    homepage = https://telegram.org/;
+    license = "GPLv2";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -8940,6 +8940,8 @@ let
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
+  telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { };
+
   telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble {
     inherit (pkgs.gnome) libsoup;
   };