diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix index f1c1f15dc72d..7c2f0a01e53c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -1,39 +1,23 @@ -{ lib, stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml -, js_of_ocaml-ppx, re }: +{ lib, buildDunePackage, fetchFromGitLab, iri, re, sedlex_2, uutf }: -if lib.versionOlder ocaml.version "4.03" -|| lib.versionAtLeast ocaml.version "4.11" -then throw "xtmpl not supported for ocaml ${ocaml.version}" -else -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-xtmpl-${version}"; - version = "0.17.0"; +buildDunePackage rec { + pname = "xtmpl"; + version = "0.19.0"; + useDune2 = true; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "xtmpl"; rev = version; - sha256 = "1hq6y4rhz958q40145k4av8hx8jyvspg78xf741samd7vc3jd221"; + sha256 = "sha256:0vwj0aayg60wm98d91fg3hmj90730liljy4cn8771dpxvz8m07bw"; }; - patches = [ ./jsoo.patch ]; - - postPatch = '' - substituteInPlace Makefile --replace js_of_ocaml.ppx js_of_ocaml-ppx - ''; - - buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ]; - propagatedBuildInputs = [ iri re ]; - - createFindlibDestdir = true; - - dontStrip = true; + propagatedBuildInputs = [ iri re sedlex_2 uutf ]; meta = with lib; { description = "XML templating library for OCaml"; homepage = "https://www.good-eris.net/xtmpl/"; license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; }; } |