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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-16 11:45:07 +01:00
parent 27313767b8 1421eee65d
commit be7125dde7
133 changed files with 1826 additions and 2024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/easy-format/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A high-level and functional interface to the Format module of the OCaml standard library";
homepage = "http://mjambon.com/${pname}.html";
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};

35
pkgs/development/ocaml-modules/facile/default.nix
View File

@@ -1,38 +1,19 @@
{ stdenv, fetchurl, ocaml, findlib }:
{ lib, fetchurl, buildDunePackage }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-facile-${version}";
version = "1.1.3";
buildDunePackage rec {
pname = "facile";
version = "1.1.4";
src = fetchurl {
url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz";
sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw";
url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";
sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";
};
dontAddPrefix = 1;
buildInputs = [ ocaml findlib ];
createFindlibDestdir = true;
installFlags = [ "FACILEDIR=$(OCAMLFIND_DESTDIR)/facile" ];
postInstall = ''
cat > $OCAMLFIND_DESTDIR/facile/META <<EOF
version = "${version}"
name = "facile"
description = "A Functional Constraint Library"
requires = ""
archive(byte) = "facile.cma"
archive(native) = "facile.cmxa"
EOF
'';
doCheck = true;
meta = {
homepage = "http://opti.recherche.enac.fr/facile/";
license = stdenv.lib.licenses.lgpl21Plus;
license = lib.licenses.lgpl21Plus;
description = "A Functional Constraint Library";
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/development/ocaml-modules/iso8601/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
meta = {
homepage = http://sagotch.github.io/ISO8601.ml/;
homepage = https://ocaml-community.github.io/ISO8601.ml/;
description = "ISO 8601 and RFC 3999 date parsing for OCaml";
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms or [];

3
pkgs/development/ocaml-modules/lwt/ppx.nix
View File

@@ -5,8 +5,7 @@ buildDunePackage {
inherit (lwt) src version;
buildInputs = [ ppx_tools_versioned ];
propagatedBuildInputs = [ lwt ];
propagatedBuildInputs = [ lwt ppx_tools_versioned ];
meta = {
description = "Ppx syntax extension for Lwt";

2
pkgs/development/ocaml-modules/yojson/default.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation ({
meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format";
homepage = "http://mjambon.com/${pname}.html";
homepage = "https://github.com/ocaml-community/${pname}";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];