Merge remote-tracking branch 'origin/master' into staging-next

K900 e36af0fb d263613f

Changed files
+20 -14
pkgs
by-name
fo
forgejo-runner
fx
wa
watchlog
development
ocaml-modules
multicore-magic
python-modules
colcon-parallel-executor
kuzu
+3 -3
pkgs/by-name/fo/forgejo-runner/package.nix
···
in
buildGoModule rec {
pname = "forgejo-runner";
-
version = "9.1.0";
+
version = "9.1.1";
src = fetchFromGitea {
domain = "code.forgejo.org";
owner = "forgejo";
repo = "runner";
rev = "v${version}";
-
hash = "sha256-w8tFpJeEx0rgzz0z3916FKEjvpewsCAXDWdSTSXo/bg=";
+
hash = "sha256-tJ1BEGKthOUf//MM8GS712YEzkcr9w2LN1ejDbVOITU=";
};
-
vendorHash = "sha256-vjsrnPg5D9+Ugf3Oeajkif6YmUX3D88QULYVgXiLJ/o=";
+
vendorHash = "sha256-hdEpA7tG1uJOBRPQTaWst/D30Y9Uez4ecK2dkZCQITk=";
# See upstream Makefile
# https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
+2 -2
pkgs/by-name/fx/fx/package.nix
···
buildGoModule (finalAttrs: {
pname = "fx";
-
version = "39.0.1";
+
version = "39.0.2";
src = fetchFromGitHub {
owner = "antonmedv";
repo = "fx";
tag = finalAttrs.version;
-
hash = "sha256-KVnPESE0Fp1liOZtpDgNpAggROnGHYdefAAECkbgZDE=";
+
hash = "sha256-fsUKdKbH+H1PD5khhIubL1DT3Qc6dLaooKe5UCXlYk0=";
};
vendorHash = "sha256-7x0nbgMzEJznDH6Wf5iaTYXLh/2IGUSeSVvb0UKKTOQ=";
+3 -3
pkgs/by-name/wa/watchlog/package.nix
···
rustPlatform.buildRustPackage rec {
pname = "watchlog";
-
version = "1.246.0";
+
version = "1.248.0";
src = fetchFromGitLab {
owner = "kevincox";
repo = "watchlog";
rev = "v${version}";
-
hash = "sha256-1AcA2Ar2XVLMfBxG2GtsXe9zNF/8pJBZ2NzihhMm3Vk=";
+
hash = "sha256-zi1tfndcjDoAT5IPj1ydjqeQyKAocR0O/jLeZTZAfO0=";
};
-
cargoHash = "sha256-83vDlH/S8rZqLwBux3WoTIkGFf01Powyz9sZpsVY+AQ=";
+
cargoHash = "sha256-/yUXaHGnhx/eOeXmAhLg9zWWHOuLGqbBBLjAJsB6JZw=";
meta = {
description = "Easier monitoring of live logs";
+8 -2
pkgs/development/ocaml-modules/multicore-magic/default.nix
···
lib,
buildDunePackage,
fetchurl,
+
nodejs-slim,
alcotest,
domain_shims,
+
js_of_ocaml,
}:
buildDunePackage rec {
pname = "multicore-magic";
-
version = "2.3.0";
+
version = "2.3.1";
src = fetchurl {
url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${version}/multicore-magic-${version}.tbz";
-
hash = "sha256-r50UqLOd2DoTz0CEXHpJMHX0fty+mGiAKTdtykgnzu4=";
+
hash = "sha256-Adcgi9yfEhhygbBK04H6N9ozg3O6JJWrXrD1MxUcGV8=";
};
doCheck = true;
···
checkInputs = [
alcotest
domain_shims
+
];
+
nativeCheckInputs = [
+
nodejs-slim
+
js_of_ocaml
];
meta = {
+2 -2
pkgs/development/python-modules/colcon-parallel-executor/default.nix
···
buildPythonPackage rec {
pname = "colcon-parallel-executor";
-
version = "0.3.0";
+
version = "0.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "colcon";
repo = "colcon-parallel-executor";
tag = version;
-
hash = "sha256-uhVl1fqoyMF/L98PYCmM6m7+52c4mWj2qlna5sz/RxE=";
+
hash = "sha256-JjpVhBpkVNFOsTnY8vEqIre4Hzwg+eDYwrR2iaIC5TA=";
};
build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/kuzu/default.nix
···
buildPythonPackage rec {
pname = "kuzu";
-
version = "0.11.1";
+
version = "0.11.2";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-H3lqQYEGVqswk955lKBUpmVn69scg40UUlss54w/PfE=";
+
hash = "sha256-nyJOwhirFloYrK6pA2lXeXgNcDNbr0Atm39ZujidsL0=";
};
pyproject = true;