Merge pull request #32437 from vbgl/ocaml-facile-1.1.3

facile: 1.1 -> 1.1.3
This commit is contained in:
Jörg Thalheim 2017-12-09 16:19:52 +00:00 committed by GitHub
commit 82235b388c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 43 deletions

View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, ocaml }:
stdenv.mkDerivation rec {
name = "facile-1.1";
src = fetchurl {
url = "${meta.homepage}/distrib/${name}.tar.gz";
sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
};
dontAddPrefix = 1;
patches = [ ./ocaml_4.xx.patch ];
postPatch = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
postConfigure = "make -C src .depend";
makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
buildInputs = [ ocaml ];
meta = {
homepage = http://www.recherche.enac.fr/log/facile;
license = "LGPL";
description = "A Functional Constraint Library";
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -1,12 +0,0 @@
diff -rupN facile-1.1/src/fcl_data.ml facile-1.1-patched//src/fcl_data.ml
--- facile-1.1/src/fcl_data.ml 2004-09-08 11:51:02.000000000 +0200
+++ facile-1.1-patched//src/fcl_data.ml 2012-12-16 13:49:36.286722670 +0100
@@ -16,7 +16,7 @@ end
module Hashtbl = struct
type ('a, 'b) t = ('a, 'b) Hashtbl.t
- let create = Hashtbl.create
+ let create x = Hashtbl.create x
let get h = h
let add h k d =

View file

@ -0,0 +1,38 @@
{ stdenv, fetchurl, ocaml, findlib }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-facile-${version}";
version = "1.1.3";
src = fetchurl {
url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz";
sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw";
};
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
'';
meta = {
homepage = "http://opti.recherche.enac.fr/facile/";
license = stdenv.lib.licenses.lgpl21Plus;
description = "A Functional Constraint Library";
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -8178,8 +8178,6 @@ with pkgs;
eventlog = callPackage ../development/libraries/eventlog { };
facile = callPackage ../development/libraries/facile { };
faac = callPackage ../development/libraries/faac { };
faad2 = callPackage ../development/libraries/faad2 { };

View file

@ -227,6 +227,8 @@ let
lwt = ocaml_lwt;
};
facile = callPackage ../development/ocaml-modules/facile { };
faillib = callPackage ../development/ocaml-modules/faillib { };
fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { };