Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee06d27cf23a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8acf4cd06cd5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 6, 2019

  1. ocamlPackages.pgocaml: 3.2 → 4.0 

    Ensures compatibility with OCaml 4.08
    @vbgl
    vbgl committed Oct 6, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    kampka Christian Kampka
    GPG key ID: B88E140DB4FE1AA5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8acf4cd View commit details
Showing with 10 additions and 17 deletions.
  1. +10 −17 pkgs/development/ocaml-modules/pgocaml/default.nix
27 changes: 10 additions & 17 deletions pkgs/development/ocaml-modules/pgocaml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,27 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, camlp4
, ppx_tools_versioned, result, rresult
{ lib, fetchFromGitHub, buildDunePackage
, calendar, csv, hex, re
}:

if !stdenv.lib.versionAtLeast ocaml.version "4.05"
then throw "pgocaml is not available for OCaml ${ocaml.version}"
else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-pgocaml-${version}";
version = "3.2";
buildDunePackage rec {
pname = "pgocaml";
version = "4.0";
src = fetchFromGitHub {
owner = "darioteixeira";
repo = "pgocaml";
rev = "v${version}";
sha256 = "0jxzr5niv8kdh90pr57b1qb500zkkasxb8b8l7w9cydcfprnlk24";
sha256 = "1s8c5prr7jb9k76bz990m836czm6k8rv5bvp6s2zg9ra0w19w90j";
};

buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned result rresult ];
propagatedBuildInputs = [ calendar csv hex re ];
minimumOCamlVersion = "4.05";

configureFlags = [ "--enable-p4" "--enable-ppx" ];
preConfigure = "patchShebangs src/genconfig.sh";

createFindlibDestdir = true;
propagatedBuildInputs = [ calendar csv hex re ];

meta = with stdenv.lib; {
meta = with lib; {
description = "An interface to PostgreSQL databases for OCaml applications";
homepage = http://pgocaml.forge.ocamlcore.org/;
inherit (src.meta) homepage;
license = licenses.lgpl2;
maintainers = with maintainers; [ vbgl ];
inherit (ocaml.meta) platforms;
};
}