Merge master into staging-next (015cac23) · Commits · nix / nixpkgs

pkgs/by-name/nc/ncps/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -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" ];

pkgs/by-name/ow/owi/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -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; [

pkgs/by-name/sc/scotch/package.nix

+16 −11

Original line number	Diff line number	Diff line
		@@ -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,22 +60,25 @@ stdenv.mkDerivation (finalAttrs: {
		mpi
		];

		# SCOTCH provide compatibility with Metis/Parmetis interface.
		# We install the metis compatible headers to subdirectory to
		# avoid conflict with metis/parmetis.
		postFixup = ''
		mkdir -p $dev/include/scotch
		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;
		};

		# SCOTCH provide compatibility with Metis/Parmetis interface.
		# We install the metis compatible headers to subdirectory to
		# avoid conflict with metis/parmetis.
		postFixup = ''
		mkdir -p $dev/include/scotch
		mv $dev/include/{*metis,metisf}.h $dev/include/scotch
		'';
		updateScript = nix-update-script { };
		};

		meta = {
		description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering";

pkgs/by-name/sh/shaperglot-cli/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -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"

pkgs/development/tools/ocaml/oasis/default.nix

+53 −50

Original line number	Diff line number	Diff line
		@@ -9,7 +9,10 @@
		ocamlify,
		}:

		stdenv.mkDerivation {
		lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "oasis is not available for OCaml ≥ 5.0"

		stdenv.mkDerivation
		{
		version = "0.4.11";
		pname = "ocaml-oasis";