From 7b91d708af39fb7a7a1e6d6d08968880d863096b Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Mon, 15 Feb 2016 01:07:15 +0100 Subject: [PATCH 1/3] qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131 --- .../instant-messengers/qtox/default.nix | 17 ++++++++++------- .../libraries/libtoxcore/new-api/default.nix | 7 +++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 72619e417ad..541fb5727ce 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv, +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, qtbase, qtsvg, qttools, qttranslations, sqlcipher }: let - revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1"; + version = "1.2.4"; + revision = "v${version}"; in stdenv.mkDerivation rec { - name = "qtox-dev-20151221"; + name = "qtox-${version}"; - src = fetchgit { - url = "https://github.com/tux3/qTox.git"; - rev = "${revision}"; - md5 = "a93a63d35e506be4b21abda0986f19e7"; + src = fetchFromGitHub { + owner = "tux3"; + repo = "qTox"; + rev = revision; + sha256 = "0iqnl00kmbpf3pn6z38n3cjzzsqpw2793j60c24kkrydapihknz9"; }; buildInputs = @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)" ''; configurePhase = '' diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index d9c543efd6c..5bb0427f181 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -2,13 +2,13 @@ , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20160105"; + name = "tox-core-dev-20160131"; src = fetchFromGitHub { owner = "irungentoo"; repo = "toxcore"; - rev = "b9ef24875ce1d9bf5f04f0164ae95f729330a295"; - sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x"; + rev = "94cc8b11ff473064526737936f64b6f9a19c239d"; + sha256 = "0njara08p5vmhs6kp04b7gxw8l6xrlmwnlb76n2g96v0rn0i9k2w"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -52,4 +52,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - From d03c73a2283dfba46beb3daed8a85f950574c36b Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 17 Feb 2016 15:43:53 +0100 Subject: [PATCH 2/3] utox: 7e290747 -> 0.5.0 --- .../instant-messengers/utox/default.nix | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 61b7e8ec510..55ec1560c5e 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,41 +1,23 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, dbus, libvpx, libX11, openal, freetype, libv4l +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: -let - - filteraudio = stdenv.mkDerivation rec { - name = "filter_audio-20150516"; - - src = fetchFromGitHub { - owner = "irungentoo"; - repo = "filter_audio"; - rev = "612c5a102550c614e4c8f859e753ea64c0b7250c"; - sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na"; - }; - - buildInputs = [ utillinux ]; - - doCheck = false; - - makeFlags = "PREFIX=$(out)"; - }; - -in stdenv.mkDerivation rec { - name = "utox-dev-20151220"; +stdenv.mkDerivation rec { + name = "utox-${version}"; + version = "0.5.0"; src = fetchFromGitHub { owner = "GrayHatter"; repo = "uTox"; - rev = "7e2907470835746b6819d631b48dd54bc9c4de66"; + rev = "v${version}"; sha256 = "074wa0np8hyqwy9xqgyyds94pdfv2i1jh019m98d8apxc5vn36wk"; }; buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype - libv4l libXrender fontconfig libXext libXft filteraudio + libv4l libXrender fontconfig libXext libXft filter-audio git libsodium ]; doCheck = false; - + makeFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { From db03fdea957f0f6b18c7284864a0c41aa6a426b1 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 17 Feb 2016 15:49:37 +0100 Subject: [PATCH 3/3] filter_audio: remove duplicate package, filter-audio already exists and in use --- .../libraries/filter_audio/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/filter_audio/default.nix diff --git a/pkgs/development/libraries/filter_audio/default.nix b/pkgs/development/libraries/filter_audio/default.nix deleted file mode 100644 index 3082e11efbf..00000000000 --- a/pkgs/development/libraries/filter_audio/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, utillinux }: - -stdenv.mkDerivation rec { - name = "filter_audio-${version}"; - version = "76428a6cda43ae77f3936f4527c5f86eb3a5e211"; - - src = fetchFromGitHub { - owner = "irungentoo"; - repo = "filter_audio"; - rev = "${version}"; - sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9"; - }; - - buildInputs = [ utillinux ]; - makeFlags = "PREFIX=$(out)"; - - meta = with stdenv.lib; { - description = "An easy to use audio filtering library made from webrtc code"; - homepage = https://github.com/irungentoo/filter_audio; - license = licenses.bsd3; - maintainers = with maintainers; [ np ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40e92629064..1f8cebc083f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -877,8 +877,6 @@ let fop = callPackage ../tools/typesetting/fop { }; - filter_audio = callPackage ../development/libraries/filter_audio { }; - fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; }; gencfsm = callPackage ../tools/security/gencfsm { };