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]
2021-01-04 12:26:43 +00:00
committed by GitHub
parent b6af78fdf5 89699cbe21
commit f0187a2cf3
18 changed files with 179 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/csv/default.nix
+2
View File
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "csv";
version = "2.4";
useDune2 = true;
src = fetchurl {
url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
pkgs/development/ocaml-modules/csv/lwt.nix
+1 -1
View File
@@ -6,7 +6,7 @@ else
buildDunePackage {
pname = "csv-lwt";
inherit (csv) src version meta;
inherit (csv) src version useDune2 meta;
propagatedBuildInputs = [ csv ocaml_lwt ];
pkgs/development/ocaml-modules/ppx_blob/default.nix
+4 -4
View File
@@ -1,18 +1,18 @@
{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ocaml-migrate-parsetree }:
{ lib, fetchurl, buildDunePackage, ocaml, alcotest, ppxlib }:
buildDunePackage rec {
pname = "ppx_blob";
version = "0.7.1";
version = "0.7.2";
useDune2 = true;
src = fetchurl {
url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz";
sha256 = "0m616ri6kmawflphiwm6j4djds27v0fjvi8xjz1fq5ydc1sq8d0l";
sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw";
};
checkInputs = [ alcotest ];
buildInputs = [ ocaml-migrate-parsetree ];
propagatedBuildInputs = [ ppxlib ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
meta = with lib; {