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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2020-12-02 18:13:37 +00:00
committed by GitHub
parent edf43c7c6f d3f5608624
commit b83ed81c33
25 changed files with 180 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/astring/default.nix
+18 -5
View File
@@ -1,12 +1,25 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
stdenv.mkDerivation rec {
version = "0.8.3";
name = "ocaml${ocaml.version}-astring-${version}";
let
# Use astring 0.8.3 for OCaml < 4.05
param =
if stdenv.lib.versionAtLeast ocaml.version "4.05"
then {
version = "0.8.5";
sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6";
} else {
version = "0.8.3";
sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0";
};
in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-astring-${param.version}";
inherit (param) version;
src = fetchurl {
url = "https://erratique.ch/software/astring/releases/astring-${version}.tbz";
sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0";
url = "https://erratique.ch/software/astring/releases/astring-${param.version}.tbz";
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];
pkgs/development/ocaml-modules/stdlib-shims/default.nix
+2 -2
View File
@@ -2,10 +2,10 @@
buildDunePackage rec {
pname = "stdlib-shims";
version = "0.2.0";
version = "0.1.0";
src = fetchurl {
url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "0nb5flrczpqla1jy2pcsxm06w4jhc7lgbpik11amwhfzdriz0n9c";
sha256 = "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk";
};
minimumOCamlVersion = "4.02";
doCheck = true;