From 9f2409096b53658bc51ebfdbb6c03cc9d3f3840f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 20 Oct 2017 13:00:55 +0200 Subject: wt: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 677357e4782f..75f6ceb00b45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10967,7 +10967,9 @@ with pkgs; wiredtiger = callPackage ../development/libraries/wiredtiger { }; - wt = callPackage ../development/libraries/wt { }; + wt = callPackage ../development/libraries/wt { + boost = boost160; # 165: error: invalid conversion from 'const char*'... + }; wxGTK = wxGTK28; -- cgit 1.4.1 From 0e339ca7a50f5e7c37029906c486e1f8eb898fb6 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 20 Oct 2017 13:12:42 +0200 Subject: clickhouse: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75f6ceb00b45..5820ff866212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11421,7 +11421,9 @@ with pkgs; charybdis = callPackage ../servers/irc/charybdis {}; - clickhouse = callPackage ../servers/clickhouse { }; + clickhouse = callPackage ../servers/clickhouse { + boost = boost160; + }; couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_1_8_5; -- cgit 1.4.1 From 90435ba0602867007f6085098c81bf34a5006f13 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 20 Oct 2017 18:13:15 +0200 Subject: Revert "wt: fixup build by using older boost again" This reverts commit 9f2409096b53658bc51ebfdbb6c03cc9d3f3840f. Now it's fixed by update 38b94d1f1f7. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f6b8aa48ec4..e3e400f6e92e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10971,9 +10971,7 @@ with pkgs; wiredtiger = callPackage ../development/libraries/wiredtiger { }; - wt = callPackage ../development/libraries/wt { - boost = boost160; # 165: error: invalid conversion from 'const char*'... - }; + wt = callPackage ../development/libraries/wt { }; wxGTK = wxGTK28; -- cgit 1.4.1 From c3263fcaa1a18d44a4191b08deeeb59a55071c1e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 20 Oct 2017 18:16:40 +0200 Subject: wt: put version into name, cleanup whitespace The style is now closer to what's usual in nixpkgs. --- pkgs/development/libraries/wt/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 8dc6db03bc31..3adf4f1497f8 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu, - pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl, - pcre }: +{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu +, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl +, pcre +}: stdenv.mkDerivation rec { - name = "wt"; + name = "wt-${version}"; version = "4.0.0"; src = fetchFromGitHub { owner = "kdeforche"; - repo = name; + repo = "wt"; rev = version; sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; }; @@ -16,9 +17,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysql postgresql graphicsmagick glew - openssl pcre ]; + buildInputs = [ + cmake boost doxygen qt48Full libharu + pango fcgi firebird libmysql postgresql graphicsmagick glew + openssl pcre + ]; cmakeFlags = [ "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.webtoolkit.eu/wt; description = "C++ library for developing web applications"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.juliendehos ]; }; -- cgit 1.4.1 From ddc41d7c6dd2f7f6d6a11ea47cd1b49f8915c442 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 20 Oct 2017 19:08:10 +0200 Subject: zanshin: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3e400f6e92e..ab062fd2bda1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17450,6 +17450,7 @@ with pkgs; zanshin = libsForQt5.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeFrameworks) krunner kwallet; + boost = boost160; }; zathura = callPackage ../applications/misc/zathura { -- cgit 1.4.1 From fd0e61a5dbe392ec73b5abf59ae270fa5d6eef3e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 20 Oct 2017 19:20:09 +0200 Subject: vowpalwabbit: fixup build by using older boost again 160 seems a popular version in nixpkgs. --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index daee60ccec43..b27147e18b50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -95,7 +95,10 @@ in { setuptools = callPackage ../development/python-modules/setuptools { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { + pythonPackages = self; + boost = pkgs.boost160; + }; acoustics = callPackage ../development/python-modules/acoustics { }; -- cgit 1.4.1