colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #227419 from vbgl/ocaml-ocamlmod-noocaml5

Browse Source 
ocamlPackages.ocaml_oasis: 0.4.10 → 0.4.11
This commit is contained in:
Weijia Wang 2023-04-26 12:57:33 +03:00 committed by GitHub
commit 2ed70d5a76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/ocaml/oasis/default.nix
View File

@ -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;
};
}

3
pkgs/development/tools/ocaml/ocamlmod/default.nix
View File

@ -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";