From 34122f7321d2abe79b6ca1086b02354495888563 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 21 Apr 2023 09:47:16 +0200 Subject: [PATCH 1/2] =?UTF-8?q?ocamlPackages.ocamlmod:=20disable=20for=20O?= =?UTF-8?q?Caml=20=E2=89=A5=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/ocamlmod/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 5b4f7e8e4407..ee287a92388f 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -5,6 +5,9 @@ let doCheck = lib.versionAtLeast ocaml.version "4.04"; in +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "ocamlmod is not available for OCaml ≥ 5.0" + stdenv.mkDerivation { pname = "ocamlmod"; version = "0.0.9"; From d3db6fe015712bba507f363551d3bf6ded16b5db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 21 Apr 2023 09:47:21 +0200 Subject: [PATCH 2/2] =?UTF-8?q?ocamlPackages.ocaml=5Foasis:=200.4.10=20?= =?UTF-8?q?=E2=86=92=200.4.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/oasis/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index c550bef7dda0..11b7c550d7c4 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: stdenv.mkDerivation { - version = "0.4.10"; + version = "0.4.11"; pname = "ocaml-oasis"; - # You must manually update the url, not just the version. OCamlforge keys off - # the number after download.php, not the filename. src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz"; - sha256 = "13ah03pbcvrjv5lmx971hvkm9rvbvimska5wmjfvgvd20ca0gn8w"; + url = "https://download.ocamlcore.org/oasis/oasis/0.4.11/oasis-0.4.11.tar.gz"; + hash = "sha256-GLc97vTtbpqDM38ks7vi3tZSaLP/cwn8wA0l5X4dwS4="; }; createFindlibDestdir = true; @@ -40,10 +38,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Configure, build and install system for OCaml projects"; - homepage = "http://oasis.forge.ocamlcore.org/"; + homepage = "https://github.com/ocaml/oasis"; license = licenses.lgpl21; maintainers = with maintainers; [ vbgl maggesi ]; mainProgram = "oasis"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; }