Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -8,20 +8,20 @@
|
||||
let
|
||||
finalAttrs = {
|
||||
pname = "ncps";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalbasit";
|
||||
repo = "ncps";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mBiasGQgwP8dRQqtn7z+tLKECDd1p0JE2nvCYLru0Ts=";
|
||||
hash = "sha256-A2HLbob9MHHCUNIC1OBwyFeE6KuEIdXW75hPSZMgicI=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-5QpzU+cy14cdR5Oi2vwA+BbMSTPMXlhyq9RpzbMsRZQ=";
|
||||
vendorHash = "sha256-Plc1L23qOYj1evVIG+O3OxVAKVeEIA+Z6sP4Z/T1SxU=";
|
||||
|
||||
doCheck = true;
|
||||
checkFlags = [ "-race" ];
|
||||
|
||||
@@ -15,14 +15,14 @@ let
|
||||
in
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "owi";
|
||||
version = "0.2-unstable-2025-09-17";
|
||||
version = "0.2-unstable-2025-09-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocamlpro";
|
||||
repo = "owi";
|
||||
rev = "a0b11f9463a7f9dc8dd84f15405dd197b8fdc9ba";
|
||||
rev = "3c5ea7f07bf0c530286870bfb37010e44b75677d";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-PQgXfFsaB9EwzHhxpvfCbnvppy0YHtcb6WB2kF5jz8Q=";
|
||||
hash = "sha256-3YGNm60ro9DzjxnjRpE2b1fde4tCxo+y8DM8nS73Hwc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -12,18 +12,20 @@
|
||||
mpi,
|
||||
withPtScotch ? false,
|
||||
testers,
|
||||
pkgsMusl ? { }, # default to empty set to avoid CI fails with allowVariants = false
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scotch";
|
||||
version = "7.0.9";
|
||||
version = "7.0.10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
owner = "scotch";
|
||||
repo = "scotch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-dbf18XdmDP0KgS4H4L7Wnam7kGF88yBcCvehYRRpHvA=";
|
||||
hash = "sha256-qeMgTkoM/RDsZa0T6hmrDLbLuSeR8WNxllyHSlkMVzA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -37,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "BUILD_PTSCOTCH" withPtScotch)
|
||||
# Prefix Scotch version of MeTiS routines
|
||||
(lib.cmakeBool "SCOTCH_METIS_PREFIX" true)
|
||||
# building tests is broken with SCOTCH_METIS_PREFIX enabled in 7.0.9
|
||||
# building tests is broken with SCOTCH_METIS_PREFIX enabled, at least since 7.0.9
|
||||
(lib.cmakeBool "ENABLE_TESTS" false)
|
||||
];
|
||||
|
||||
@@ -58,15 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mpi
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "SCOTCH" ];
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# SCOTCH provide compatibility with Metis/Parmetis interface.
|
||||
# We install the metis compatible headers to subdirectory to
|
||||
# avoid conflict with metis/parmetis.
|
||||
@@ -75,6 +68,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mv $dev/include/{*metis,metisf}.h $dev/include/scotch
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
cmake-config = testers.hasCmakeConfigModules {
|
||||
moduleNames = [ "SCOTCH" ];
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
musl = pkgsMusl.scotch or null;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering";
|
||||
longDescription = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "shaperglot-cli";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "shaperglot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YbAitVNBSPvYg2wsBmvNS/NA6M7ZDY7w/lYgDNs3i4Y=";
|
||||
hash = "sha256-Jh2/Rr7bIPFiblUZFS8KiQtMwmtMuOGCSV2w7LMCbq8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-miGaE2SntBi4tHrK2bz4A77gnUX0zIBvnvDDZIVeveo=";
|
||||
cargoHash = "sha256-3cHUSRvrvywfiYA/WpUrCIJV+hEQQwRNTPvSmCN50ho=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package=shaperglot-cli"
|
||||
|
||||
@@ -9,54 +9,57 @@
|
||||
ocamlify,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "0.4.11";
|
||||
pname = "ocaml-oasis";
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "oasis is not available for OCaml ≥ 5.0"
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.ocamlcore.org/oasis/oasis/0.4.11/oasis-0.4.11.tar.gz";
|
||||
hash = "sha256-GLc97vTtbpqDM38ks7vi3tZSaLP/cwn8wA0l5X4dwS4=";
|
||||
};
|
||||
stdenv.mkDerivation
|
||||
{
|
||||
version = "0.4.11";
|
||||
pname = "ocaml-oasis";
|
||||
|
||||
createFindlibDestdir = true;
|
||||
src = fetchurl {
|
||||
url = "https://download.ocamlcore.org/oasis/oasis/0.4.11/oasis-0.4.11.tar.gz";
|
||||
hash = "sha256-GLc97vTtbpqDM38ks7vi3tZSaLP/cwn8wA0l5X4dwS4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
createFindlibDestdir = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
ocaml
|
||||
findlib
|
||||
ocamlbuild
|
||||
ocamlmod
|
||||
ocamlify
|
||||
];
|
||||
strictDeps = true;
|
||||
|
||||
buildInputs = [ ocamlbuild ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
ocaml setup.ml -configure --prefix $out
|
||||
runHook postConfigure
|
||||
'';
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
ocaml setup.ml -build
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
ocaml setup.ml -install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configure, build and install system for OCaml projects";
|
||||
homepage = "https://github.com/ocaml/oasis";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [
|
||||
vbgl
|
||||
maggesi
|
||||
nativeBuildInputs = [
|
||||
ocaml
|
||||
findlib
|
||||
ocamlbuild
|
||||
ocamlmod
|
||||
ocamlify
|
||||
];
|
||||
mainProgram = "oasis";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
buildInputs = [ ocamlbuild ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
ocaml setup.ml -configure --prefix $out
|
||||
runHook postConfigure
|
||||
'';
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
ocaml setup.ml -build
|
||||
runHook postBuild
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
ocaml setup.ml -install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configure, build and install system for OCaml projects";
|
||||
homepage = "https://github.com/ocaml/oasis";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [
|
||||
vbgl
|
||||
maggesi
|
||||
];
|
||||
mainProgram = "oasis";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,56 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
ocaml,
|
||||
findlib,
|
||||
ocamlbuild,
|
||||
ounit,
|
||||
buildDunePackage,
|
||||
fetchurl,
|
||||
ounit2,
|
||||
}:
|
||||
|
||||
let
|
||||
# ounit is only available for OCaml >= 4.08
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "ocamlmod";
|
||||
version = "0.1.1";
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gildor478/ocamlmod/releases/download/v${finalAttrs.version}/ocamlmod-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-qMG+y/iS+L4qtKiJX01pTTAdQuGLoIA+so1fqY9bm8o=";
|
||||
};
|
||||
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
in
|
||||
checkInputs = [ ounit2 ];
|
||||
|
||||
lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "ocamlmod is not available for OCaml ≥ 5.0"
|
||||
dontStrip = true;
|
||||
|
||||
stdenv.mkDerivation
|
||||
{
|
||||
pname = "ocamlmod";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz";
|
||||
sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa";
|
||||
};
|
||||
|
||||
strictDeps = !doCheck;
|
||||
|
||||
nativeBuildInputs = [
|
||||
ocaml
|
||||
findlib
|
||||
ocamlbuild
|
||||
meta = {
|
||||
homepage = "https://github.com/gildor478/ocamlmod";
|
||||
description = "Generate OCaml modules from source files";
|
||||
maintainers = with lib.maintainers; [
|
||||
maggesi
|
||||
];
|
||||
|
||||
configurePhase =
|
||||
"ocaml setup.ml -configure --prefix $out" + lib.optionalString doCheck " --enable-tests";
|
||||
buildPhase = "ocaml setup.ml -build";
|
||||
installPhase = "ocaml setup.ml -install";
|
||||
|
||||
inherit doCheck;
|
||||
nativeCheckInputs = [ ounit ];
|
||||
|
||||
checkPhase = "ocaml setup.ml -test";
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod";
|
||||
description = "Generate OCaml modules from source files";
|
||||
platforms = ocaml.meta.platforms or [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
maggesi
|
||||
];
|
||||
};
|
||||
}
|
||||
mainProgram = "ocamlmod";
|
||||
};
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user