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

Merge recent master into staging

Browse Source 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
This commit is contained in:
Vladimír Čunát
2014-11-05 15:00:44 +01:00
parent c0e2aceef4 8e02bde1a8
commit 52404a868d
288 changed files with 8123 additions and 4307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/eliom/default.nix
+19 -15
View File
@@ -1,30 +1,34 @@
{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp}:
ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam}:
stdenv.mkDerivation
stdenv.mkDerivation rec
{
name = "eliom-4.0.0";
pname = "eliom";
version = "4.1.0";
name = "${pname}-${version}";
src = fetchurl {
url = https://github.com/ocsigen/eliom/archive/4.0.0.tar.gz;
sha256 = "1xf2l6lvngxzwaw6lvr6sgi48rz0wxg65q9lz4jzqjarkp0sx206";
url = https://github.com/ocsigen/eliom/archive/4.1.0.tar.gz;
sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24";
};
buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
js_of_ocaml ocaml_react ocaml_lwt calendar
cryptokit tyxml ocaml_ipaddr ocamlnet ocaml_ssl
ocaml_pcre ocaml_optcomp];
js_of_ocaml ocaml_optcomp opam];
preConfigure =
''chmod a+x configure
sed s/deriving-ocsigen/deriving/g -i configure
propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ocaml_ipaddr
calendar cryptokit ocamlnet ocaml_react ocaml_ssl
ocaml_pcre ];
installPhase =
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in
''opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/
'';
configureFlags = "--root $(out) --prefix /";
dontAddPrefix = true;
createFindlibDestdir = true;
meta = {
pkgs/development/ocaml-modules/gg/default.nix
+48
View File
@@ -0,0 +1,48 @@
{ stdenv, fetchurl, ocaml, findlib, opam }:
let
inherit (stdenv.lib) getVersion versionAtLeast;
pname = "gg";
version = "0.9.0";
webpage = "http://erratique.ch/software/${pname}";
in
assert versionAtLeast (getVersion ocaml) "4.01.0";
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "055pza6jbjjj7wgzf7pbn0ccxw76i8w5b2bcnaz8b9m4x6jaa6gh";
};
buildInputs = [ ocaml findlib opam ];
createFindlibDestdir = true;
unpackCmd = "tar xjf $src";
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase = ''
opam-installer --script --prefix=$out ${pname}.install | sh
ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
'';
meta = with stdenv.lib; {
description = "Basic types for computer graphics in OCaml";
longDescription = ''
Gg is an OCaml module providing basic types for computer graphics. It
defines types and functions for floats, vectors, points, sizes,
matrices, quaternions, axis aligned boxes, colors, color spaces, and
raster data.
'';
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
license = licenses.bsd3;
maintainers = [ maintainers.jirkamarsik ];
};
}
pkgs/development/ocaml-modules/lablgtk/default.nix
+3 -3
View File
@@ -3,7 +3,7 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "lablgtk";
version = "2.18.2";
version = "2.18.3";
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12";
@@ -11,8 +11,8 @@ assert stdenv.lib.versionAtLeast ocaml_version "3.12";
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = https://forge.ocamlcore.org/frs/download.php/1456/lablgtk-2.18.2.tar.gz;
sha256 = "0f9rs4av0v7p5k8hifcq4b49xx8jmmfch3sdk9pij8a8jfgwxvfy";
url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz;
sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp";
};
buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4];
pkgs/development/ocaml-modules/lwt/default.nix
+10 -7
View File
@@ -1,7 +1,9 @@
{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib}:
{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4}:
let
version = "2.4.5";
inherit (stdenv.lib) optional getVersion versionAtLeast;
ocaml_version = getVersion ocaml;
in
stdenv.mkDerivation {
@@ -15,21 +17,22 @@ stdenv.mkDerivation {
sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e";
};
buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses];
buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses camlp4];
propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ];
configureFlags = [ "--enable-all" ];
configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ]
++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel";
createFindlibDestdir = true;
meta = {
meta = with stdenv.lib; {
homepage = http://ocsigen.org/lwt;
description = "Lightweight thread library for Objective Caml";
license = "LGPL";
license = licenses.lgpl21;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z stdenv.lib.maintainers.gal_bolle
maintainers = with maintainers; [
z77z vbgl gal_bolle
];
};
}
pkgs/development/ocaml-modules/ocsigen-server/default.nix
+9 -5
View File
@@ -1,14 +1,18 @@
{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree}:
{stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib,
libev, openssl, ocaml_sqlite3, tree, uutf}:
stdenv.mkDerivation {
name = "ocsigenserver-2.4.0";
name = "ocsigenserver-2.5";
src = fetchurl {
url = https://github.com/ocsigen/ocsigenserver/archive/2.4.0.tar.gz;
sha256 = "1fjj8g6ivyfsa0446w77rjihhbw0gh5pgx7brywql2shk999riby";
url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz;
sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r";
};
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl ocaml_sqlite3 tree];
buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt
ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl
ocaml_sqlite3 tree uutf];
configureFlags = "--root $(out) --prefix /";
pkgs/development/ocaml-modules/otfm/default.nix
+49
View File
@@ -0,0 +1,49 @@
{ stdenv, fetchurl, ocaml, findlib, opam, uutf }:
let
inherit (stdenv.lib) getVersion versionAtLeast;
pname = "otfm";
version = "0.2.0";
webpage = "http://erratique.ch/software/${pname}";
in
assert versionAtLeast (getVersion ocaml) "4.01.0";
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "1wgi9plf98gd7x3b7fzjxds089sivsap97bl1bw2lj73nxwnyb9c";
};
buildInputs = [ ocaml findlib opam ];
propagatedBuildInputs = [ uutf ];
createFindlibDestdir = true;
unpackCmd = "tar xjf $src";
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
installPhase = ''
opam-installer --script --prefix=$out ${pname}.install | sh
ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
'';
meta = with stdenv.lib; {
description = "OpenType font decoder for OCaml";
longDescription = ''
Otfm is an in-memory decoder for the OpenType font data format. It
provides low-level access to font tables and functions to decode some
of them.
'';
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
license = licenses.bsd3;
maintainers = [ maintainers.jirkamarsik ];
};
}
pkgs/development/ocaml-modules/tyxml/default.nix
+6 -4
View File
@@ -1,15 +1,17 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}:
{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf}:
stdenv.mkDerivation {
name = "tyxml-3.1.1";
name = "tyxml-3.3.0";
src = fetchurl {
url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz;
sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z";
url = http://github.com/ocsigen/tyxml/archive/3.3.0.tar.gz;
sha256 = "0r1hj8qy91i48nd7wj0x2dqrgspqrry5awraxl4pl10vh0mn6pk7";
};
buildInputs = [ocaml findlib ocaml_oasis camlp4];
propagatedBuildInputs = [uutf];
createFindlibDestdir = true;
meta = with stdenv.lib; {
pkgs/development/ocaml-modules/vg/default.nix
+62
View File
@@ -0,0 +1,62 @@
{ stdenv, fetchurl, ocaml, findlib, opam, gg, uutf, otfm, js_of_ocaml,
pdfBackend ? true, # depends on uutf and otfm
htmlcBackend ? true # depends on js_of_ocaml
}:
let
inherit (stdenv.lib) getVersion optionals versionAtLeast;
pname = "vg";
version = "0.8.1";
webpage = "http://erratique.ch/software/${pname}";
in
assert versionAtLeast (getVersion ocaml) "4.01.0";
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "1cdcvsr5z8845ndilnrz7p4n6yn4gv2p91z2mgi4vrailcmn5vzd";
};
buildInputs = [ ocaml findlib opam ];
propagatedBuildInputs = [ gg ]
++ optionals pdfBackend [ uutf otfm ]
++ optionals htmlcBackend [ js_of_ocaml ];
createFindlibDestdir = true;
unpackCmd = "tar xjf $src";
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"
+ (if pdfBackend then " uutf=true otfm=true"
else " uutf=false otfm=false")
+ (if htmlcBackend then " jsoo=true"
else " jsoo=false");
installPhase = ''
opam-installer --script --prefix=$out ${pname}.install | sh
ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
'';
meta = with stdenv.lib; {
description = "Declarative 2D vector graphics for OCaml";
longDescription = ''
Vg is an OCaml module for declarative 2D vector graphics. In Vg, images
are values that denote functions mapping points of the cartesian plane
to colors. The module provides combinators to define and compose these
values.
Renderers for PDF, SVG and the HTML canvas are distributed with the
module. An API allows to implement new renderers.
'';
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
license = licenses.bsd3;
maintainers = [ maintainers.jirkamarsik ];
};
}