From 15268306febdc338ec6a00e8099c1904287f598a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:19:23 +0800 Subject: [PATCH 1/6] libtoxcore: introduce 0.2.2 in addition to 0.1.11 --- .../libraries/libtoxcore/default.nix | 79 ++++++++++--------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 9af8718dc5fe..42d2fe11f7b3 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,46 +1,51 @@ { stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack , libvpx, check, libconfig, pkgconfig }: -stdenv.mkDerivation rec { - name = "libtoxcore-${version}"; - version = "0.1.11"; +let + generic = { version, sha256 }: + stdenv.mkDerivation rec { + name = "libtoxcore-${version}"; - src = fetchFromGitHub { - owner = "TokTok"; - repo = "c-toxcore"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "TokTok"; + repo = "c-toxcore"; + rev = "v${version}"; + inherit sha256; + }; + + cmakeFlags = [ + "-DBUILD_NTOX=ON" + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ]; + + buildInputs = [ + libsodium libmsgpack ncurses libconfig + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ + libopus libvpx + ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "P2P FOSS instant messaging application aimed to replace Skype"; + homepage = https://tox.chat; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; + }; + +in rec { + libtoxcore_0_1 = generic { + version = "0.1.11"; sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; }; - cmakeFlags = [ - "-DBUILD_NTOX=ON" - "-DDHT_BOOTSTRAP=ON" - "-DBOOTSTRAP_DAEMON=ON" - ]; - - buildInputs = [ - libsodium libmsgpack ncurses libconfig - ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ - libopus - libvpx - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - enableParallelBuilding = true; - - checkInputs = [ check ]; - - checkPhase = "ctest"; - - # for some reason the tests are not running - it says "No tests found!!" - doCheck = true; - - meta = with stdenv.lib; { - description = "P2P FOSS instant messaging application aimed to replace Skype"; - homepage = https://tox.chat; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + libtoxcore_0_2 = generic { + version = "0.2.2"; + sha256 = "1463grbbv009pj2g6dbnyk4lr871vw41962m63v21mmp6dkrr7r5"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac46ff0f4cc..fea7f1e34415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10358,9 +10358,12 @@ with pkgs; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; - libtoxcore = callPackage ../development/libraries/libtoxcore { }; + inherit (callPackages ../development/libraries/libtoxcore {}) + libtoxcore_0_1 libtoxcore_0_2; + libtoxcore = libtoxcore_0_2; libtap = callPackage ../development/libraries/libtap { }; From 058df14f81482e05fad93b017e8a8d45cea10db5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:19:48 +0800 Subject: [PATCH 2/6] ratox: 0.4 -> 0.4.20180303 --- .../instant-messengers/ratox/default.nix | 18 ++++++++++-------- .../instant-messengers/ratox/ldlibs.patch | 5 ----- 2 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 5d004db60e3a..add337d3f085 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -5,22 +5,24 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in -stdenv.mkDerivation rec { - name = "ratox-0.4"; +in stdenv.mkDerivation rec { + name = "ratox-0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; - rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; - sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; + rev = "269f7f97fb374a8f9c0b82195c21de15b81ddbbb"; + sha256 = "0bpn37h8jvsqd66fkba8ky42nydc8acawa5x31yxqlxc8mc66k74"; }; - patches = [ ./ldlibs.patch ]; - buildInputs = [ libtoxcore ]; - preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; + preConfigure = '' + substituteInPlace config.mk \ + --replace '-lsodium -lopus -lvpx ' "" + + ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch deleted file mode 100644 index 1406e7143107..000000000000 --- a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib --LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread -+LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread From 88454d73b0c72137eb04f30c0e053db139d71b2a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:20:27 +0800 Subject: [PATCH 3/6] qtox: 1.13.1 -> 1.15.0 --- .../instant-messengers/qtox/default.nix | 29 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index bbad5a681807..f7a56d47dbfa 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, - libtoxcore, - libpthreadstubs, libXdmcp, libXScrnSaver, - qtbase, qtsvg, qttools, qttranslations, - ffmpeg, filter-audio, libexif, libsodium, libopus, - libvpx, openal, pcre, qrencode, sqlcipher }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, libtoxcore +, libpthreadstubs, libXdmcp, libXScrnSaver +, qtbase, qtsvg, qttools, qttranslations +, ffmpeg, filter-audio, libexif, libsodium, libopus +, libvpx, openal, pcre, qrencode, sqlcipher +, AVFoundation ? null }: -mkDerivation rec { +let + version = "1.15.0"; + rev = "v${version}"; + +in mkDerivation rec { name = "qtox-${version}"; - version = "1.13.0"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - rev = "v${version}"; - sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; + sha256 = "1garwnlmg452b0bwx36rsh08s15q3zylb26l01iiwg4l9vcaldh9"; + inherit rev; }; buildInputs = [ @@ -22,17 +26,18 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ]; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = [ - "-DGIT_DESCRIBE=${version}" + "-DGIT_DESCRIBE=${rev}" "-DENABLE_STATUSNOTIFIER=False" "-DENABLE_GTK_SYSTRAY=False" "-DENABLE_APPINDICATOR=False" + "-DTIMESTAMP=1" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fea7f1e34415..e9224ecbe66e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17461,7 +17461,7 @@ with pkgs; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { ffmpeg = ffmpeg_2; }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; From 3f454bc90f2c569f237b9df56db75bbedd2feae3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:20:46 +0800 Subject: [PATCH 4/6] toxic: 0.7.2 -> 0.8.2 --- .../networking/instant-messengers/toxic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4934a7374058..8a45e988c07d 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "toxic-${version}"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc"; + sha256 = "0fwmk945nip98m3md58y3ibjmzfq25hns3xf0bmbc6fjpww8d5p5"; }; makeFlags = [ "PREFIX=$(out)"]; From 8ce6587966040ab03a2f7d1d26223bed59c65cbe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:21:01 +0800 Subject: [PATCH 5/6] utox: 0.16.1 -> 0.17.0 --- .../instant-messengers/utox/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 9c208dd52a83..e139904fee53 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: +{ stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig +, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }: stdenv.mkDerivation rec { name = "utox-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; + sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + fetchSubmodules = true; }; buildInputs = [ @@ -20,16 +22,20 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake git pkgconfig check + check cmake pkgconfig ]; cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + "-DENABLE_AUTOUPDATE=OFF" + ] ++ lib.optional (doCheck) "-DENABLE_TESTS=ON"; - doCheck = true; + doCheck = stdenv.isLinux; - checkTarget = "test"; + checkPhase = '' + runHook preCheck + ctest -VV + runHook postCheck + ''; meta = with stdenv.lib; { description = "Lightweight Tox client"; From 8811d1d384d38962927450cf8f69d675f72ee80a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Apr 2018 18:21:25 +0800 Subject: [PATCH 6/6] toxvpn: 2017-06-25 -> 2018-04-17 --- pkgs/tools/networking/toxvpn/default.nix | 19 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c7fa1c7a2719..ccb9f3bc0d6b 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,25 +1,22 @@ { stdenv, fetchFromGitHub, cmake, nlohmann_json, -libtoxcore, libsodium, systemd, libcap, zeromq }: + libtoxcore, libsodium, libcap, zeromq, + systemd ? null }: with stdenv.lib; -let - systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd; - if_systemd = optional (systemdOrNull != null); -in stdenv.mkDerivation rec { - name = "toxvpn-${version}"; - version = "2017-06-25"; +stdenv.mkDerivation rec { + name = "toxvpn-2018-04-17"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44"; - sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0"; + rev = "dc766f98888f500ea51f002f59007eac3f3a0a06"; + sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ if_systemd systemd - ++ optional (stdenv.system != "x86_64-darwin") libcap; + ++ optionals stdenv.isLinux [ libcap systemd ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9224ecbe66e..c60f99b82cb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5220,7 +5220,7 @@ with pkgs; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; - toxvpn = callPackage ../tools/networking/toxvpn { }; + toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; }; tpmmanager = callPackage ../applications/misc/tpmmanager { };