commit 900fc49013c83e39ed7b22260d15a616a939b32e · pyrox.dev/nixpkgs

+11 -13

pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         version = "dd181722ea";

     

       5
       5
       -
         date = "20141202";

     

       6
       6
       -
       in

     

       7
       3
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "tox-prpl-${date}-${version}";

     

       4
       4
       +
         name = "tox-prpl-${version}";

     

       5
       5
       +
         version = "0.5.1";

     

       9
       6
        
       

     

       10
       7
        
         src = fetchFromGitHub {

     

       11
       11
       -
           owner = "jin-eld";

     

       12
       12
       -
           repo = "tox-prpl";

     

       13
       13
       -
           rev = "${version}";

     

       14
       14
       -
           sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v";

     

       8
       8
       +
           owner  = "jin-eld";

     

       9
       9
       +
           repo   = "tox-prpl";

     

       10
       10
       +
           rev    = "v${version}";

     

       11
       11
       +
           sha256 = "0ms367l2f7x83k407c93bmhpyc820f1css61fh2gx4jq13cxqq3p";

     

       15
       12
        
         };

     

       16
       13
        
       

     

       17
       14
        
         NIX_LDFLAGS = "-lssp -lsodium";

     

       18
       15
        
       

     

       19
       16
        
         postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";

     

       20
       17
        
       

     

       21
       21
       -
         buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];

     

       18
       18
       +
         buildInputs = [ libtoxcore pidgin libsodium ];

     

       19
       19
       +
         nativeBuildInputs = [ autoreconfHook ];

     

       22
       20
        
       

     

       23
       23
       -
         meta = {

     

       21
       21
       +
         meta = with stdenv.lib; {

     

       24
       22
        
           homepage = http://tox.dhs.org/;

     

       25
       23
        
           description = "Tox plugin for Pidgin / libpurple";

     

       26
       26
       -
           license = stdenv.lib.licenses.gpl3;

     

       27
       27
       -
           platforms = stdenv.lib.platforms.linux;

     

       24
       24
       +
           license = licenses.gpl3;

     

       25
       25
       +
           platforms = platforms.linux;

     

       28
       26
        
         };

     

       29
       27
        
       }

+19 -34

pkgs/applications/networking/instant-messengers/qtox/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv,

     

       2
       2
       -
         libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv,

     

       2
       2
       +
         libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,

     

       3
       3
        
         pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,

     

       4
       4
       -
         qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }:

     

       5
       5
       -
       

     

       6
       6
       -
       let

     

       7
       7
       -
         version = "1.5.0";

     

       8
       8
       -
         revision = "v${version}";

     

       9
       9
       -
       in

     

       4
       4
       +
         qtbase, qtsvg, qttools, qttranslations, sqlcipher,

     

       5
       5
       +
         libvpx, libopus }:

     

       10
       6
        
       

     

       11
       7
        
       stdenv.mkDerivation rec {

     

       12
       8
        
         name = "qtox-${version}";

     

       9
       9
       +
         version = "1.8.1";

     

       13
       10
        
       

     

       14
       11
        
         src = fetchFromGitHub {

     

       15
       15
       -
             owner = "tux3";

     

       16
       16
       -
             repo = "qTox";

     

       17
       17
       -
             rev = revision;

     

       18
       18
       -
             sha256 = "1na2qqzbdbjfw8kymxw5jfglslmw18fz3vpw805pqg4d5y7f7vsi";

     

       12
       12
       +
           owner  = "tux3";

     

       13
       13
       +
           repo   = "qTox";

     

       14
       14
       +
           rev    = "v${version}";

     

       15
       15
       +
           sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq";

     

       19
       16
        
         };

     

       20
       17
        
       

     

       21
       21
       -
         buildInputs =

     

       22
       22
       -
           [

     

       23
       23
       -
             libtoxcore-dev openal opencv libsodium filter-audio

     

       24
       24
       -
             qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo

     

       25
       25
       -
             pango atk qrencode ffmpeg qttranslations makeQtWrapper

     

       26
       26
       -
             sqlcipher

     

       27
       27
       -
           ];

     

       18
       18
       +
         buildInputs = [

     

       19
       19
       +
           libtoxcore openal opencv libsodium filter-audio

     

       20
       20
       +
           qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo

     

       21
       21
       +
           pango atk qrencode ffmpeg qttranslations

     

       22
       22
       +
           sqlcipher

     

       23
       23
       +
           libopus libvpx

     

       24
       24
       +
         ] ++ (with xorg; [

     

       25
       25
       +
           libpthreadstubs libXdmcp

     

       26
       26
       +
         ]);

     

       28
       27
        
       

     

       29
       29
       -
         nativeBuildInputs = [ pkgconfig qmakeHook ];

     

       30
       30
       -
       

     

       31
       31
       -
         preConfigure = ''

     

       32
       32
       -
           # patch .pro file for proper set of the git hash

     

       33
       33
       -
           sed -i '/git rev-parse/d' qtox.pro

     

       34
       34
       -
           sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro

     

       35
       35
       -
           # since .pro have hardcoded paths, we need to explicitly set paths here

     

       36
       36
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)"

     

       37
       37
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)"

     

       38
       38
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"

     

       39
       39
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)"

     

       40
       40
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)"

     

       41
       41
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)"

     

       42
       42
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)"

     

       43
       43
       -
         '';

     

       28
       28
       +
         nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];

     

       44
       29
        
       

     

       45
       30
        
         installPhase = ''

     

       46
       31
        
           runHook preInstall

+13 -12

pkgs/applications/networking/instant-messengers/toxic/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, libsodium, ncurses, curl

     

       2
       2
       -
       , libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig

     

       3
       3
       -
       , libqrencode }:

     

       2
       2
       +
       , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus

     

       3
       3
       +
       , libqrencode, gdk_pixbuf, libnotify }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "toxic-dev-20160728";

     

       6
       6
       +
         name = "toxic-${version}";

     

       7
       7
       +
         version = "0.7.2";

     

       7
       8
        
       

     

       8
       9
        
         src = fetchFromGitHub {

     

       9
       9
       -
           owner = "Tox";

     

       10
       10
       -
           repo = "toxic";

     

       11
       11
       -
           rev = "cb21672600206423c844306a84f8b122e534c348";

     

       12
       12
       -
           sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k";

     

       10
       10
       +
           owner  = "Tox";

     

       11
       11
       +
           repo   = "toxic";

     

       12
       12
       +
           rev    = "v${version}";

     

       13
       13
       +
           sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc";

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       15
       -
         makeFlags = [ "PREFIX=$(out)" ];

     

       16
       16
       -
         installFlags = [ "PREFIX=$(out)" ];

     

       16
       16
       +
         makeFlags = [ "PREFIX=$(out)"];

     

       17
       17
       +
         installFlags = [ "PREFIX=$(out)"];

     

       17
       18
        
       

     

       18
       18
       -
         nativeBuildInputs = [ pkgconfig libconfig ];

     

       19
       19
        
         buildInputs = [

     

       20
       20
       -
           libtoxcore-dev libsodium ncurses curl

     

       20
       20
       +
           libtoxcore libsodium ncurses curl gdk_pixbuf libnotify

     

       21
       21
        
         ] ++ stdenv.lib.optionals (!stdenv.isArm) [

     

       22
       22
       -
           openal libvpx freealut libqrencode

     

       22
       22
       +
           openal libopus libvpx freealut libqrencode

     

       23
       23
        
         ];

     

       24
       24
       +
         nativeBuildInputs = [ pkgconfig libconfig ];

     

       24
       25
        
       

     

       25
       26
        
         meta = with stdenv.lib; {

     

       26
       27
        
           description = "Reference CLI for Tox";

+15 -9

pkgs/applications/networking/instant-messengers/utox/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l

     

       2
       2
        
       , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "utox-${version}";

     

       6
       6
       -
         version = "0.9.8";

     

       6
       6
       +
         version = "0.12.2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
       -
           owner = "GrayHatter";

     

       10
       10
       -
           repo = "uTox";

     

       11
       11
       -
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "0ahwdwqhi1gmvw80jihc1ba4cqqnx8ifjnzazxidfdky4ikzccmn";

     

       9
       9
       +
           owner  = "uTox";

     

       10
       10
       +
           repo   = "uTox";

     

       11
       11
       +
           rev    = "v${version}";

     

       12
       12
       +
           sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype

     

       16
       16
       -
                         libv4l libXrender fontconfig libXext libXft filter-audio

     

       17
       17
       -
                         git libsodium ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           libtoxcore dbus libvpx libX11 openal freetype

     

       17
       17
       +
           libv4l libXrender fontconfig libXext libXft filter-audio

     

       18
       18
       +
           libsodium

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           cmake git pkgconfig

     

       23
       23
       +
         ];

     

       18
       24
        
       

     

       19
       25
        
         doCheck = false;

     

       20
       26

+41

pkgs/development/libraries/libtoxcore/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack

     

       2
       2
       +
       , libvpx, check, libconfig, pkgconfig }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "libtoxcore-${version}";

     

       6
       6
       +
         version = "0.1.6";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner  = "TokTok";

     

       10
       10
       +
           repo   = "c-toxcore";

     

       11
       11
       +
           rev    = "v${version}";

     

       12
       12
       +
           sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         cmakeFlags = [

     

       16
       16
       +
           "-DBUILD_NTOX=ON"

     

       17
       17
       +
           "-DDHT_BOOTSTRAP=ON"

     

       18
       18
       +
           "-DBOOTSTRAP_DAEMON=ON"

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           libsodium libmsgpack ncurses

     

       23
       23
       +
         ] ++ stdenv.lib.optionals (!stdenv.isArm) [

     

       24
       24
       +
           libopus

     

       25
       25
       +
           libvpx

     

       26
       26
       +
         ];

     

       27
       27
       +
         nativeBuildInputs = [ cmake pkgconfig ];

     

       28
       28
       +
         checkInputs = [ check ];

     

       29
       29
       +
       

     

       30
       30
       +
         checkPhase = "ctest";

     

       31
       31
       +
       

     

       32
       32
       +
         # for some reason the tests are not running - it says "No tests found!!"

     

       33
       33
       +
         doCheck = true;

     

       34
       34
       +
       

     

       35
       35
       +
         meta = with stdenv.lib; {

     

       36
       36
       +
           description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";

     

       37
       37
       +
           license = licenses.gpl3Plus;

     

       38
       38
       +
           maintainers = with maintainers; [ peterhoeg ];

     

       39
       39
       +
           platforms = platforms.all;

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+1 -1

pkgs/development/libraries/libtoxcore/new-api/default.nix pkgs/development/libraries/libtoxcore/new-api.nix

···

       2
       2
        
       , libvpx, check, libconfig, pkgconfig }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "tox-core-dev-20160727";

     

       5
       5
       +
         name = "tox-core-new-20160727";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "irungentoo";

+3 -3

pkgs/development/libraries/libtoxcore/old-api/default.nix pkgs/development/libraries/libtoxcore/old-api.nix

···

       4
       4
        
       let

     

       5
       5
        
         version = "4c220e336330213b151a0c20307d0a1fce04ac9e";

     

       6
       6
        
         date = "20150126";

     

       7
       7
       -
       in

     

       8
       8
       -
       stdenv.mkDerivation rec {

     

       9
       9
       -
         name = "tox-core-${date}-${builtins.substring 0 7 version}";

     

       7
       7
       +
       

     

       8
       8
       +
       in stdenv.mkDerivation rec {

     

       9
       9
       +
         name = "tox-core-old-${date}-${builtins.substring 0 7 version}";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner  = "irungentoo";

+10 -18

pkgs/tools/networking/toxvpn/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, cmake, lib

     

       2
       2
       +
       , libtoxcore, jsoncpp, libsodium, systemd, libcap }:

     

       2
       3
        
       

     

       3
       4
        
       with lib;

     

       4
       5
        
       

     

       5
       5
       -
       let

     

       6
       6
       -
         libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: {

     

       7
       7
       -
           name = "libtoxcore-2016-09-07";

     

       8
       8
       -
           src = fetchFromGitHub {

     

       9
       9
       -
             owner  = "TokTok";

     

       10
       10
       -
             repo   = "toxcore";

     

       11
       11
       -
             rev    = "3521898b0cbf398d882496f6382f6c4ea1c23bc1";

     

       12
       12
       -
             sha256 = "1jvf0v9cqwd4ssj1iarhgsr05qg48v7yvmbnn3k01jy0lqci8iaq";

     

       13
       13
       -
           };

     

       14
       14
       -
         });

     

       15
       15
       -
       

     

       16
       16
       -
       in stdenv.mkDerivation {

     

       17
       17
       -
         name = "toxvpn-2016-09-09";

     

       6
       6
       +
       stdenv.mkDerivation rec {

     

       7
       7
       +
         name = "toxvpn-${version}";

     

       8
       8
       +
         version = "20161230";

     

       18
       9
        
       

     

       19
       10
        
         src = fetchFromGitHub {

     

       20
       11
        
           owner  = "cleverca22";

     

       21
       12
        
           repo   = "toxvpn";

     

       22
       22
       -
           rev    = "6e188f26fff8bddc1014ee3cc7a7423f9f344a09";

     

       23
       23
       -
           sha256 = "1bshc6pzk7z7q7g17cwx9gmlcyzn4szqvdiy0ihbk2xmx9k31c6p";

     

       13
       13
       +
           rev    = "4b7498a5fae680484cb5779ac01fb08ad3089bdd";

     

       14
       14
       +
           sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp";

     

       24
       15
        
         };

     

       25
       16
        
       

     

       26
       26
       -
         buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd;

     

       17
       17
       +
         buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd;

     

       18
       18
       +
         nativeBuildInputs = [ cmake ];

     

       27
       19
        
       

     

       28
       28
       -
         cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ];

     

       20
       20
       +
         cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];

     

       29
       21
        
       

     

       30
       22
        
         meta = with stdenv.lib; {

     

       31
       23
        
           description = "A powerful tool that allows one to make tunneled point to point connections over Tox";

+10 -4

pkgs/top-level/all-packages.nix

···

       8570
       8570
        
       

     

       8571
       8571
        
         libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { };

     

       8572
       8572
        
       

     

       8573
       8573
       -
         libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { };

     

       8573
       8573
       +
         libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { };

     

       8574
       8574
        
       

     

       8575
       8575
       -
         libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };

     

       8575
       8575
       +
         libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };

     

       8576
       8576
       +
       

     

       8577
       8577
       +
         libtoxcore = callPackage ../development/libraries/libtoxcore { };

     

       8576
       8578
        
       

     

       8577
       8579
        
         libtap = callPackage ../development/libraries/libtap { };

     

       8578
       8580
        
       

     
···

       14623
       14625
        
       

     

       14624
       14626
        
         telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };

     

       14625
       14627
        
       

     

       14626
       14626
       -
         toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };

     

       14628
       14628
       +
         toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {

     

       14629
       14629
       +
           libtoxcore = libtoxcore-new;

     

       14630
       14630
       +
         };

     

       14627
       14631
        
       

     

       14628
       14632
        
         pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };

     

       14629
       14633
        
       

     
···

       14807
       14811
        
       

     

       14808
       14812
        
         ratmen = callPackage ../tools/X11/ratmen {};

     

       14809
       14813
        
       

     

       14810
       14810
       -
         ratox = callPackage ../applications/networking/instant-messengers/ratox { };

     

       14814
       14814
       +
         ratox = callPackage ../applications/networking/instant-messengers/ratox {

     

       14815
       14815
       +
           libtoxcore = libtoxcore-old;

     

       14816
       14816
       +
         };

     

       14811
       14817
        
       

     

       14812
       14818
        
         ratpoison = callPackage ../applications/window-managers/ratpoison { };

     

       14813
       14819