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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-16 15:16:50 +02:00
parent 3c6efec2c0 e39bf7a704
commit 09dc132e04
826 changed files with 8930 additions and 7226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/ocaml/findlib/default.nix
View File

@@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation {
name = "ocaml-findlib-1.4.1";
name = "ocaml-findlib-1.5.3";
src = fetchurl {
url = http://download.camlcity.org/download/findlib-1.4.1.tar.gz;
sha256 = "0cdbr716r5686zvf86b9zm5ikdz0dw727m67b1f4rjjisp5v2zyf";
url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz;
sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r";
};
buildInputs = [m4 ncurses ocaml];

9
pkgs/development/tools/ocaml/findlib/install_topfind.patch
View File

@@ -1,12 +1,11 @@
--- findlib-1.3.3/src/findlib/Makefile
+++ findlib-1.3.3/src/findlib/Makefile
@@ -82,7 +82,7 @@ clean:
--- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200
+++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200
@@ -89,7 +89,7 @@
install: all
mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \
cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \

16
pkgs/development/tools/ocaml/oasis/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv,
{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4,
ocamlmod, ocamlify, ounit, expect}:
stdenv.mkDerivation {
name = "ocaml-oasis-0.4.1";
name = "ocaml-oasis-0.4.4";
src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.1.tar.gz;
url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.4.tar.bz2;
sha256 = "1lsnw9f1jh6106kphxg40qp0sia6cbkbb9ahs5y6ifnfkmllkjhj";
};
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs =
[
ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit
ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4
];
propagatedBuildInputs = [ ocaml_data_notation ];
@@ -22,13 +22,13 @@ stdenv.mkDerivation {
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
meta = {
meta = with stdenv.lib; {
homepage = http://oasis.forge.ocamlcore.org/;
description = "Configure, build and install system for OCaml projects";
license = stdenv.lib.licenses.lgpl21;
license = licenses.lgpl21;
platforms = ocaml.meta.platforms;
maintainers = with stdenv.lib.maintainers; [
z77z
maintainers = with maintainers; [
vbgl z77z
];
};
}

6
pkgs/development/tools/ocaml/utop/default.nix
View File

@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
version = "1.14";
version = "1.15";
name = "utop-${version}";
src = fetchurl {
url = https://github.com/diml/utop/archive/1.14.tar.gz;
sha256 = "17dqinvdrpba2fjs7sl6gxs47rrx6j8a5bbjhc7flp6bdls898zk";
url = https://github.com/diml/utop/archive/1.15.tar.gz;
sha256 = "106v0x6sa2x10zgmjf73mpzws7xiqanxswivd00iqnpc0bcpkmrr";
};
buildInputs = [ ocaml findlib makeWrapper];