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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Robert Schütz
2021-02-26 10:56:17 +01:00
parent 109cbc400f c456a2512f
commit 54757b35c1
580 changed files with 9820 additions and 3062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/ocaml/crunch/default.nix
View File

@@ -1,10 +1,12 @@
{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, opaline, ptime }:
{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }:
buildDunePackage rec {
pname = "crunch";
version = "3.1.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-v${version}.tbz";
sha256 = "0d26715a4h9r1wibnc12xy690m1kan7hrcgbb5qk8x78zsr67lnf";
@@ -15,7 +17,7 @@ buildDunePackage rec {
outputs = [ "lib" "bin" "out" ];
installPhase = ''
${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib/
dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib/
'';
meta = {

6
pkgs/development/tools/ocaml/ocp-index/default.nix
View File

@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "ocp-index";
version = "1.2.1";
version = "1.2.2";
useDune2 = true;
src = fetchzip {
url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8";
sha256 = "0k4i0aabyn750f4wqbnk0yv10kdjd6nhjw2pbmpc4cz639qcsm40";
};
buildInputs = [ cppo cmdliner re ];
@@ -16,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ ocp-indent ];
meta = {
homepage = "http://typerex.ocamlpro.com/ocp-index.html";
homepage = "https://www.typerex.org/ocp-index.html";
description = "A simple and light-weight documentation extractor for OCaml";
license = lib.licenses.lgpl3;
maintainers = with lib.maintainers; [ vbgl ];

4
pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
View File

@@ -3,7 +3,7 @@
stdenv.mkDerivation rec
{
pname = "ocsigen-i18n";
version = "3.5.0";
version = "3.7.0";
buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec
src = fetchzip {
url = "https://github.com/besport/${pname}/archive/${version}.tar.gz";
sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq";
sha256 = "sha256-PmdDyn+MUcNFrZpP/KLGQzdXUFRr+dYRAZjTZxHSeaw=";
};
meta = {