wt: split into wt3 and wt4

This commit is contained in:
WilliButz 2018-01-04 21:18:48 +01:00
parent 06a8d66528
commit 1a74ff64bb
No known key found for this signature in database
GPG Key ID: 92582A10F1179CB2
2 changed files with 51 additions and 34 deletions

View File

@ -1,24 +1,26 @@
{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, doxygen, qt48Full, libharu
, pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl , pango, fcgi, firebird, mysql, postgresql, graphicsmagick, glew, openssl
, pcre , pcre
}: }:
let
generic =
{ version, sha256 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wt-${version}"; name = "wt-${version}";
version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kdeforche"; owner = "kdeforche";
repo = "wt"; repo = "wt";
rev = version; rev = version;
sha256 = "1451xxvnx6mlvxg0jxlr1mfv5v18h2214kijk5kacilqashfc43i"; inherit sha256;
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
cmake boost doxygen qt48Full libharu cmake boost165 doxygen qt48Full libharu
pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew pango fcgi firebird mysql.connector-c postgresql graphicsmagick glew
openssl pcre openssl pcre
]; ];
@ -36,7 +38,19 @@ stdenv.mkDerivation rec {
description = "C++ library for developing web applications"; description = "C++ library for developing web applications";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.juliendehos ]; maintainers = with maintainers; [ juliendehos willibutz ];
};
};
in {
wt3 = generic {
# with the next version update the version pinning of boost should be omitted
version = "3.3.9";
sha256 = "1mkflhvzzzxkc5yzvr6nk34j0ldpwxjxb6n7xml59h3j3px3ixjm";
};
wt4 = generic {
# with the next version update the version pinning of boost should be omitted
version = "4.0.2";
sha256 = "0r729gjd1sy0pcmir2r7ga33mp5cr5b4gvf44852q65hw2577w1x";
}; };
} }

View File

@ -11278,7 +11278,10 @@ with pkgs;
wiredtiger = callPackage ../development/libraries/wiredtiger { }; wiredtiger = callPackage ../development/libraries/wiredtiger { };
wt = callPackage ../development/libraries/wt { }; wt = wt4;
inherit (callPackages ../development/libraries/wt {})
wt3
wt4;
wxGTK = wxGTK28; wxGTK = wxGTK28;