diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-08-26 12:01:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 12:01:09 +0000 |
| commit | b13b005f0e80936eb9eb9dfcaea06b65e9d56648 (patch) | |
| tree | 39f81f5905945bd506670059bc04ae722301c4c8 /pkgs/development/ocaml-modules | |
| parent | 572dfaae2c8bde2378df831d1dad5df39c5bc9be (diff) | |
| parent | 3ce2efcaa9f15de618643d1f02aa649461253ae2 (diff) | |
| download | nixlib-b13b005f0e80936eb9eb9dfcaea06b65e9d56648.tar nixlib-b13b005f0e80936eb9eb9dfcaea06b65e9d56648.tar.gz nixlib-b13b005f0e80936eb9eb9dfcaea06b65e9d56648.tar.bz2 nixlib-b13b005f0e80936eb9eb9dfcaea06b65e9d56648.tar.lz nixlib-b13b005f0e80936eb9eb9dfcaea06b65e9d56648.tar.xz nixlib-b13b005f0e80936eb9eb9dfcaea06b65e9d56648.tar.zst nixlib-b13b005f0e80936eb9eb9dfcaea06b65e9d56648.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/integers/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/ppx_cstubs/default.nix | 7 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index 97443bf5706e..ed5ccbedb64d 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip, buildDunePackage, ocaml }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: buildDunePackage rec { pname = "integers"; - version = "0.4.0"; + version = "0.5.1"; useDune2 = lib.versionAtLeast ocaml.version "4.08"; - src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; + src = fetchFromGitHub { + owner = "ocamllabs"; + repo = "ocaml-integers"; + rev = version; + sha256 = "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi"; }; meta = { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; homepage = "https://github.com/ocamllabs/ocaml-integers"; + changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index b4ddb4dd5e45..6ad6c4cd8985 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { pname = "ppx_cstubs"; - version = "0.6.1.1"; + version = "0.6.1.2"; useDune2 = true; @@ -21,7 +21,7 @@ buildDunePackage rec { owner = "fdopen"; repo = "ppx_cstubs"; rev = version; - sha256 = "0rgg78435ypi6ryhcq5ljkch4qjvra2jqjd47c2hhhcbwvi2ssxh"; + sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; buildInputs = [ @@ -37,8 +37,9 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; + changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; description = "Preprocessor for easier stub generation with ocaml-ctypes"; - license = licenses.mit; + license = licenses.lgpl21Plus; maintainers = [ maintainers.osener ]; }; } |