push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/bin/fiber/fiber.ml b/bin/fiber/fiber.ml
index 188a92cc9..6087a8687 100644
--- a/bin/fiber/fiber.ml
+++ b/bin/fiber/fiber.ml
@@ -129,7 +129,7 @@ let worker pool =
let get_concurrency () =
try
- let ic = Unix.open_process_in "getconf _NPROCESSORS_ONLN" in
+ let ic = Unix.open_process_in "@getconf@/bin/getconf _NPROCESSORS_ONLN" in
let close () = ignore (Unix.close_process_in ic) in
let sc = Scanf.Scanning.from_channel ic in
try

View File

@@ -0,0 +1,96 @@
{
lib,
buildDunePackage,
fetchurl,
ke,
duff,
decompress,
cstruct,
optint,
bigstringaf,
checkseum,
logs,
psq,
fmt,
result,
rresult,
fpath,
base64,
bos,
digestif,
alcotest,
crowbar,
alcotest-lwt,
lwt,
findlib,
mirage-flow,
cmdliner,
hxd,
getconf,
replaceVars,
}:
buildDunePackage rec {
pname = "carton";
version = "0.7.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz";
hash = "sha256-vWkBJdP4ZpRCEwzrFMzsdHay4VyiXix/+1qzk+7yDvk=";
};
patches = [
(replaceVars ./carton-find-getconf.patch {
getconf = "${getconf}";
})
];
# remove changelogs for mimic and the git* packages
postPatch = ''
rm CHANGES.md
'';
buildInputs = [
cmdliner
digestif
result
rresult
fpath
bos
hxd
];
propagatedBuildInputs = [
ke
duff
decompress
cstruct
optint
bigstringaf
checkseum
logs
psq
fmt
];
doCheck = true;
nativeBuildInputs = [
findlib
];
checkInputs = [
base64
alcotest
alcotest-lwt
crowbar
lwt
mirage-flow
];
meta = with lib; {
description = "Implementation of PACKv2 file in OCaml";
license = licenses.mit;
homepage = "https://github.com/mirage/ocaml-git";
maintainers = [ maintainers.sternenseemann ];
};
}

View File

@@ -0,0 +1,33 @@
{
buildDunePackage,
carton,
carton-lwt,
bigstringaf,
lwt,
fpath,
result,
fmt,
decompress,
astring,
}:
buildDunePackage {
pname = "carton-git";
inherit (carton) version src postPatch;
duneVersion = "3";
propagatedBuildInputs = [
carton
carton-lwt
bigstringaf
lwt
fpath
result
fmt
decompress
astring
];
inherit (carton) meta;
}

View File

@@ -0,0 +1,65 @@
{
buildDunePackage,
carton,
lwt,
decompress,
optint,
bigstringaf,
alcotest,
alcotest-lwt,
cstruct,
fmt,
logs,
mirage-flow,
result,
rresult,
ke,
base64,
bos,
checkseum,
digestif,
fpath,
stdlib-shims,
git-binary, # pkgs.git
}:
buildDunePackage {
pname = "carton-lwt";
inherit (carton) version src postPatch;
duneVersion = "3";
propagatedBuildInputs = [
carton
lwt
decompress
optint
bigstringaf
];
# Tests fail with git 2.41
# see https://github.com/mirage/ocaml-git/issues/617
doCheck = false;
nativeCheckInputs = [
git-binary
];
checkInputs = [
alcotest
alcotest-lwt
cstruct
fmt
logs
mirage-flow
result
rresult
ke
base64
bos
checkseum
digestif
fpath
stdlib-shims
];
inherit (carton) meta;
}