diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/ocaml-modules/ocaml-gettext | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/ocaml-modules/ocaml-gettext')
3 files changed, 23 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix new file mode 100644 index 00000000000..012f3b61ff3 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -0,0 +1,16 @@ +{ buildDunePackage, ocaml_gettext, camomile, ounit, fileutils }: + +buildDunePackage { + pname = "gettext-camomile"; + inherit (ocaml_gettext) src version useDune2; + + propagatedBuildInputs = [ camomile ocaml_gettext ]; + + doCheck = true; + checkInputs = [ ounit fileutils ]; + + meta = ocaml_gettext.meta // { + description = "Internationalization library using camomile (i18n)"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index ba571b32084..7525a10030e 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; + useDune2 = true; + src = fetchurl { url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index b18c0abc530..51e902b9140 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -1,14 +1,16 @@ -{ lib, buildDunePackage, ocaml_gettext, ounit }: +{ buildDunePackage, ocaml_gettext, dune-configurator, ounit }: buildDunePackage rec { pname = "gettext-stub"; - inherit (ocaml_gettext) src version meta; + inherit (ocaml_gettext) src version useDune2 meta; + + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ocaml_gettext ]; doCheck = true; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; } |