public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source 
Hydra seems very good.
This commit is contained in:
Vladimír Čunát 2017-10-20 23:46:03 +02:00
commit bd8daca057
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/wt/default.nix
View File

@ -1,14 +1,15 @@
{stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu, { stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu
pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl, , pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl
pcre }: , pcre
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wt"; name = "wt-${version}";
version = "4.0.0"; version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kdeforche"; owner = "kdeforche";
repo = name; repo = "wt";
rev = version; rev = version;
sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i";
}; };
@ -16,9 +17,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake boost doxygen qt48Full libharu buildInputs = [
cmake boost doxygen qt48Full libharu
pango fcgi firebird libmysql postgresql graphicsmagick glew pango fcgi firebird libmysql postgresql graphicsmagick glew
openssl pcre ]; openssl pcre
];
cmakeFlags = [ cmakeFlags = [
"-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick"

5
pkgs/top-level/all-packages.nix
View File

@ -11425,7 +11425,9 @@ with pkgs;
charybdis = callPackage ../servers/irc/charybdis {}; charybdis = callPackage ../servers/irc/charybdis {};
clickhouse = callPackage ../servers/clickhouse { }; clickhouse = callPackage ../servers/clickhouse {
boost = boost160;
};
couchdb = callPackage ../servers/http/couchdb { couchdb = callPackage ../servers/http/couchdb {
spidermonkey = spidermonkey_1_8_5; spidermonkey = spidermonkey_1_8_5;
@ -17451,6 +17453,7 @@ with pkgs;
zanshin = libsForQt5.callPackage ../applications/office/zanshin { zanshin = libsForQt5.callPackage ../applications/office/zanshin {
inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap;
inherit (kdeFrameworks) krunner kwallet; inherit (kdeFrameworks) krunner kwallet;
boost = boost160;
}; };
zathura = callPackage ../applications/misc/zathura { zathura = callPackage ../applications/misc/zathura {

5
pkgs/top-level/python-packages.nix
View File

@ -95,7 +95,10 @@ in {
setuptools = callPackage ../development/python-modules/setuptools { }; 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 { }; acoustics = callPackage ../development/python-modules/acoustics { };