diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-07-10 10:48:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 10:48:54 +0200 |
| commit | c2af5149c80abd627fc963ddff612a6c157bf371 (patch) | |
| tree | 1c5f5f6f1c06be36a4bfa1a1733f4a7e6cbc3c47 /pkgs/development | |
| parent | 51d03096516948822faf612e906fcfe629337ad4 (diff) | |
| parent | de1a8ddb3c58ef477940054224646c7ed550a7cd (diff) | |
| download | nixlib-c2af5149c80abd627fc963ddff612a6c157bf371.tar nixlib-c2af5149c80abd627fc963ddff612a6c157bf371.tar.gz nixlib-c2af5149c80abd627fc963ddff612a6c157bf371.tar.bz2 nixlib-c2af5149c80abd627fc963ddff612a6c157bf371.tar.lz nixlib-c2af5149c80abd627fc963ddff612a6c157bf371.tar.xz nixlib-c2af5149c80abd627fc963ddff612a6c157bf371.tar.zst nixlib-c2af5149c80abd627fc963ddff612a6c157bf371.zip | |
Merge pull request #43261 from vbgl/ocaml-iri-0.4.0
ocamlPackages.iri: init at 0.4.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/iri/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix | 10 |
2 files changed, 39 insertions, 5 deletions
diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix new file mode 100644 index 000000000000..15f3a5613b55 --- /dev/null +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitLab, ocaml, findlib +, sedlex, uunf, uutf +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "iri is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + version = "0.4.0"; + name = "ocaml${ocaml.version}-iri-${version}"; + + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "zoggy"; + repo = "ocaml-iri"; + rev = version; + sha256 = "0fsmfmzmyggm0h77a7mb0n41vqi6q4ln1xzsv72zbvysa7l8w84q"; + }; + + buildInputs = [ ocaml findlib ]; + + propagatedBuildInputs = [ sedlex uunf uutf ]; + + createFindlibDestdir = true; + + meta = { + description = "IRI (RFC3987) native OCaml implementation"; + license = stdenv.lib.licenses.lgpl3; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 5d27dc35396c..363b774aaeba 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml-migrate-parsetree }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocaml-migrate-parsetree }: -buildOcaml rec { - name = "ppx_tools_versioned"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_tools_versioned-${version}"; version = "5.1"; - minimumSupportedOcamlVersion = "4.02"; - src = fetchFromGitHub { owner = "let-def"; repo = "ppx_tools_versioned"; @@ -13,6 +11,8 @@ buildOcaml rec { sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624"; }; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ ocaml-migrate-parsetree ]; createFindlibDestdir = true; |