From ce2d9bac9f8a8c9bcb158cc89a9f5669238b866f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 11 Oct 2017 17:54:53 +0800 Subject: [PATCH 1/5] libmsgpack: house keeping --- pkgs/development/libraries/libmsgpack/generic.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix index c6870f77f1f3..7bca8f21c6b9 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -11,16 +11,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; + crossAttrs = { } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { - cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows"; + cmakeFlags = [ + "-DMSGPACK_BUILD_EXAMPLES=OFF" + "-DCMAKE_SYSTEM_NAME=Windows" + ]; }; meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; - homepage = http://msgpack.org; + homepage = http://msgpack.org; + license = licenses.asl20; maintainers = with maintainers; [ redbaron wkennington ]; - license = licenses.asl20; - platforms = platforms.all; + platforms = platforms.all; }; } From 01a7d7038bf18a29133a79c6d5c3facfc10f0923 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 11 Oct 2017 17:55:16 +0800 Subject: [PATCH 2/5] libmsgpack: 2.0.0 -> 2.1.5 --- pkgs/development/libraries/libmsgpack/2.0.nix | 12 ++++++++++++ pkgs/development/libraries/libmsgpack/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/libmsgpack/2.0.nix diff --git a/pkgs/development/libraries/libmsgpack/2.0.nix b/pkgs/development/libraries/libmsgpack/2.0.nix new file mode 100644 index 000000000000..d8282b126872 --- /dev/null +++ b/pkgs/development/libraries/libmsgpack/2.0.nix @@ -0,0 +1,12 @@ +{ callPackage, fetchFromGitHub, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7"; + }; +}) diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index 2af7e31c889a..8feacd4e3653 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.0.0"; + version = "2.1.5"; src = fetchFromGitHub { - owner = "msgpack"; - repo = "msgpack-c"; - rev = "cpp-${version}"; - sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7"; + owner = "msgpack"; + repo = "msgpack-c"; + rev = "cpp-${version}"; + sha256 = "0n4kvma3dldfsvv7b0zw23qln6av5im2aqqd6m890i75zwwkw0zv"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7383df20c0ec..7ac98ea6d473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9227,6 +9227,7 @@ with pkgs; libmtp = callPackage ../development/libraries/libmtp { }; libmsgpack = callPackage ../development/libraries/libmsgpack { }; + libmsgpack_2_0 = callPackage ../development/libraries/libmsgpack/2.0.nix { }; libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { From 1d2ecd96616eb73b073599cbc24222cd31318f80 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 11 Oct 2017 17:54:18 +0800 Subject: [PATCH 3/5] libtoxcore: 0.1.8 -> 0.1.10 --- pkgs/development/libraries/libtoxcore/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 0d0563eb5ddf..af9c38a96346 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libtoxcore-${version}"; - version = "0.1.8"; + version = "0.1.10"; src = fetchFromGitHub { owner = "TokTok"; repo = "c-toxcore"; rev = "v${version}"; - sha256 = "08vdq3j60wn62lj2z9f3f47hibns93rvaqx5xc5bm3nglk70q7kk"; + sha256 = "1d3f7lnlxra2lhih838bvlahxqv50j35g9kfyzspq971sb5z30mv"; }; cmakeFlags = [ @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { libopus libvpx ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + enableParallelBuilding = true; + checkInputs = [ check ]; checkPhase = "ctest"; From e48691c2d49d5781d2905cf3eccdef49dc84da7c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 2 Oct 2017 17:39:23 +0800 Subject: [PATCH 4/5] qtox: 1.11.0 -> 1.12.1 --- .../networking/instant-messengers/qtox/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index aee739256746..0bc3118d101b 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -2,25 +2,25 @@ libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver, qtbase, qtsvg, qttools, qttranslations, - ffmpeg, filter-audio, libsodium, libopus, + ffmpeg, filter-audio, libexif, libsodium, libopus, libvpx, openal, opencv, pcre, qrencode, sqlcipher }: mkDerivation rec { name = "qtox-${version}"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { - owner = "tux3"; + owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck"; + sha256 = "1832ay0167qjc2vvpps507mnb0531y3d3pxmlm5nakvcwjs7vl8d"; }; buildInputs = [ libtoxcore libpthreadstubs libXdmcp libXScrnSaver qtbase qtsvg qttools qttranslations - ffmpeg filter-audio libopus libsodium + ffmpeg filter-audio libexif libopus libsodium libvpx openal opencv pcre qrencode sqlcipher ]; @@ -37,6 +37,7 @@ mkDerivation rec { meta = with lib; { description = "Qt Tox client"; + homepage = https://tox.chat; license = licenses.gpl3; maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; platforms = platforms.all; From 24b70b56a04ec3bac5b7571b37a6238fbc4a438a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 11 Oct 2017 20:05:41 +0800 Subject: [PATCH 5/5] utox: run tests --- .../networking/instant-messengers/utox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 9c4d88761b87..9c208dd52a83 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_UPDATER=OFF" - ]; + ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; - doCheck = false; + doCheck = true; checkTarget = "test";