diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-22 10:28:41 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-12-13 14:17:31 +0100 |
| commit | beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470 (patch) | |
| tree | ce6aab567a18b88b15f871fcd0703cc37cbf2d38 | |
| parent | e89623239d966b4429787b0767eda3c51b3377bf (diff) | |
| download | nixpkgs-beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470.tar nixpkgs-beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470.tar.gz nixpkgs-beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470.tar.bz2 nixpkgs-beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470.tar.lz nixpkgs-beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470.tar.xz nixpkgs-beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470.tar.zst nixpkgs-beaf7262e6a1d8276eccc93b3fd9ea2dd2e11470.zip | |
ocamlPackages.stdcompat: 18 → 19
https://github.com/thierry-martinez/stdcompat/releases/tag/v19
| -rw-r--r-- | pkgs/development/ocaml-modules/stdcompat/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index 3630be368e5..b8dcc81bfe7 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -1,29 +1,25 @@ -{ stdenv, lib, fetchurl -, ocaml, findlib +{ buildDunePackage +, lib +, fetchurl }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-stdcompat"; - version = "18"; +buildDunePackage rec { + pname = "stdcompat"; + version = "19"; src = fetchurl { url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; + sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; }; - nativeBuildInputs = [ ocaml findlib ]; - strictDeps = true; - # build fails otherwise - enableParallelBuilding = false; - - configureFlags = [ "--libdir=$(OCAMLFIND_DESTDIR)" ]; + # Otherwise ./configure script will run and create files conflicting with dune. + dontConfigure = true; meta = { homepage = "https://github.com/thierry-martinez/stdcompat"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; }; } |