Skip to content

Commit e36af0f

Browse files
committed
Merge remote-tracking branch 'origin/master' into staging-next
2 parents d263613 + afffd05 commit e36af0f

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

pkgs/by-name/fo/forgejo-runner/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ let
4141
in
4242
buildGoModule rec {
4343
pname = "forgejo-runner";
44-
version = "9.1.0";
44+
version = "9.1.1";
4545

4646
src = fetchFromGitea {
4747
domain = "code.forgejo.org";
4848
owner = "forgejo";
4949
repo = "runner";
5050
rev = "v${version}";
51-
hash = "sha256-w8tFpJeEx0rgzz0z3916FKEjvpewsCAXDWdSTSXo/bg=";
51+
hash = "sha256-tJ1BEGKthOUf//MM8GS712YEzkcr9w2LN1ejDbVOITU=";
5252
};
5353

54-
vendorHash = "sha256-vjsrnPg5D9+Ugf3Oeajkif6YmUX3D88QULYVgXiLJ/o=";
54+
vendorHash = "sha256-hdEpA7tG1uJOBRPQTaWst/D30Y9Uez4ecK2dkZCQITk=";
5555

5656
# See upstream Makefile
5757
# https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile

pkgs/by-name/fx/fx/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
buildGoModule (finalAttrs: {
99
pname = "fx";
10-
version = "39.0.1";
10+
version = "39.0.2";
1111

1212
src = fetchFromGitHub {
1313
owner = "antonmedv";
1414
repo = "fx";
1515
tag = finalAttrs.version;
16-
hash = "sha256-KVnPESE0Fp1liOZtpDgNpAggROnGHYdefAAECkbgZDE=";
16+
hash = "sha256-fsUKdKbH+H1PD5khhIubL1DT3Qc6dLaooKe5UCXlYk0=";
1717
};
1818

1919
vendorHash = "sha256-7x0nbgMzEJznDH6Wf5iaTYXLh/2IGUSeSVvb0UKKTOQ=";

pkgs/by-name/wa/watchlog/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
rustPlatform.buildRustPackage rec {
88
pname = "watchlog";
9-
version = "1.246.0";
9+
version = "1.248.0";
1010

1111
src = fetchFromGitLab {
1212
owner = "kevincox";
1313
repo = "watchlog";
1414
rev = "v${version}";
15-
hash = "sha256-1AcA2Ar2XVLMfBxG2GtsXe9zNF/8pJBZ2NzihhMm3Vk=";
15+
hash = "sha256-zi1tfndcjDoAT5IPj1ydjqeQyKAocR0O/jLeZTZAfO0=";
1616
};
1717

18-
cargoHash = "sha256-83vDlH/S8rZqLwBux3WoTIkGFf01Powyz9sZpsVY+AQ=";
18+
cargoHash = "sha256-/yUXaHGnhx/eOeXmAhLg9zWWHOuLGqbBBLjAJsB6JZw=";
1919

2020
meta = {
2121
description = "Easier monitoring of live logs";

pkgs/development/ocaml-modules/multicore-magic/default.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
lib,
33
buildDunePackage,
44
fetchurl,
5+
nodejs-slim,
56
alcotest,
67
domain_shims,
8+
js_of_ocaml,
79
}:
810

911
buildDunePackage rec {
1012
pname = "multicore-magic";
11-
version = "2.3.0";
13+
version = "2.3.1";
1214

1315
src = fetchurl {
1416
url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${version}/multicore-magic-${version}.tbz";
15-
hash = "sha256-r50UqLOd2DoTz0CEXHpJMHX0fty+mGiAKTdtykgnzu4=";
17+
hash = "sha256-Adcgi9yfEhhygbBK04H6N9ozg3O6JJWrXrD1MxUcGV8=";
1618
};
1719

1820
doCheck = true;
@@ -21,6 +23,10 @@ buildDunePackage rec {
2123
alcotest
2224
domain_shims
2325
];
26+
nativeCheckInputs = [
27+
nodejs-slim
28+
js_of_ocaml
29+
];
2430

2531
meta = {
2632
description = "Low-level multicore utilities for OCaml";

pkgs/development/python-modules/colcon-parallel-executor/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
buildPythonPackage rec {
1313
pname = "colcon-parallel-executor";
14-
version = "0.3.0";
14+
version = "0.4.0";
1515
pyproject = true;
1616

1717
src = fetchFromGitHub {
1818
owner = "colcon";
1919
repo = "colcon-parallel-executor";
2020
tag = version;
21-
hash = "sha256-uhVl1fqoyMF/L98PYCmM6m7+52c4mWj2qlna5sz/RxE=";
21+
hash = "sha256-JjpVhBpkVNFOsTnY8vEqIre4Hzwg+eDYwrR2iaIC5TA=";
2222
};
2323
build-system = [ setuptools ];
2424

pkgs/development/python-modules/kuzu/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
buildPythonPackage rec {
1010
pname = "kuzu";
11-
version = "0.11.1";
11+
version = "0.11.2";
1212

1313
src = fetchPypi {
1414
inherit pname version;
15-
hash = "sha256-H3lqQYEGVqswk955lKBUpmVn69scg40UUlss54w/PfE=";
15+
hash = "sha256-nyJOwhirFloYrK6pA2lXeXgNcDNbr0Atm39ZujidsL0=";
1616
};
1717

1818
pyproject = true;

0 commit comments

Comments
 (0)