diff options
author | Florent Becker <florent.becker@ens-lyon.org> | 2016-10-22 11:05:39 +0200 |
---|---|---|
committer | Florent Becker <florent.becker@ens-lyon.org> | 2016-10-22 11:23:41 +0200 |
commit | a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1 (patch) | |
tree | 0d289c92269e16e9d0da2facaea4565b926d5d8e /pkgs | |
parent | 51e0173c284aecc857fd81533df36e541ae66f08 (diff) | |
download | nixlib-a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1.tar nixlib-a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1.tar.gz nixlib-a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1.tar.bz2 nixlib-a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1.tar.lz nixlib-a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1.tar.xz nixlib-a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1.tar.zst nixlib-a52c1b484017d57ec1a7a9bb3a7add8bcabc11a1.zip |
pgocaml: 2.2 -> 2.3
Changes the build system from mkDerivation to buildOcaml
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/ocaml-modules/pgocaml/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index 6b9ae97ad54e..a8b3ed158625 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, calendar, csv, ocaml_pcre }: +{ stdenv, fetchurl, buildOcaml, calendar, csv, re }: -stdenv.mkDerivation { - name = "ocaml-pgocaml-2.2"; +buildOcaml { + name = "pgocaml"; + version = "2.3"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1506/pgocaml-2.2.tgz; - sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh"; + url = https://github.com/darioteixeira/pgocaml/archive/v2.3.tar.gz; + sha256 = "18lymxlvcf4nwxawkidq3pilsp5rhl0l8ifq6pjk3ssjlx9w53pg"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - propagatedBuildInputs = [ calendar csv ocaml_pcre ]; + buildInputs = [ ]; + propagatedBuildInputs = [ calendar csv re ]; + + configureFlags = [ "--enable-p4" ]; createFindlibDestdir = true; @@ -16,7 +19,6 @@ stdenv.mkDerivation { description = "An interface to PostgreSQL databases for OCaml applications"; homepage = http://pgocaml.forge.ocamlcore.org/; license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } |