Skip to content

Commit bb91d46

Browse files
Merge master into staging-next
2 parents 7d8b48d + 4513971 commit bb91d46

File tree

74 files changed

+289
-362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+289
-362
lines changed

nixos/modules/services/matrix/mautrix-signal.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ in
268268
buildDocsInSandbox = false;
269269
doc = ./mautrix-signal.md;
270270
maintainers = with lib.maintainers; [
271-
niklaskorz
271+
alyaeanyx
272272
frederictobiasc
273273
];
274274
};

nixos/tests/cosmic.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@
7575
if (enableAutologin) then
7676
''
7777
with subtest("cosmic-greeter initialisation"):
78-
machine.wait_for_unit("graphical.target")
78+
machine.wait_for_unit("graphical.target", timeout=120)
7979
''
8080
else
8181
''
8282
from time import sleep
8383
84-
machine.wait_for_unit("graphical.target")
85-
machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter")
84+
machine.wait_for_unit("graphical.target", timeout=120)
85+
machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter", timeout=30)
8686
# Sleep for 10 seconds for ensuring that `greetd` loads the
8787
# password prompt for the login screen properly.
8888
sleep(10)
@@ -96,7 +96,7 @@
9696
# `cosmic-session` target is the Workspaces applet. So, wait
9797
# for it to start. The process existing means that COSMIC
9898
# now handles any opened windows from now on.
99-
machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'")
99+
machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'", timeout=30)
100100
101101
# The best way to test for Wayland and XWayland is to launch
102102
# the GUI applications and see the results yourself.
@@ -121,7 +121,7 @@
121121
machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30)
122122
machine.succeed(f"pkill {gui_app}", timeout=5)
123123
124-
machine.succeed("echo 'test completed succeessfully' > /${testName}")
124+
machine.succeed("echo 'test completed succeessfully' > /${testName}", timeout=5)
125125
machine.copy_from_vm('/${testName}')
126126
127127
machine.shutdown()

pkgs/applications/emulators/blink/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
stdenv,
33
fetchFromGitHub,
44
lib,
5+
zlib,
56
}:
67

78
stdenv.mkDerivation (finalAttrs: {
@@ -15,6 +16,8 @@ stdenv.mkDerivation (finalAttrs: {
1516
hash = "sha256-4wgDftXOYm2fMP+/aTRljDi38EzbbwAJlQkuxjAMl3I=";
1617
};
1718

19+
buildInputs = [ zlib ];
20+
1821
# Do not include --enable-static and --disable-shared flags during static compilation
1922
dontAddStaticConfigureFlags = true;
2023

pkgs/applications/emulators/libretro/cores/dosbox-pure.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
}:
66
mkLibretroCore {
77
core = "dosbox-pure";
8-
version = "0-unstable-2025-03-18";
8+
version = "0-unstable-2025-04-10";
99

1010
src = fetchFromGitHub {
1111
owner = "schellingb";
1212
repo = "dosbox-pure";
13-
rev = "619c575db6f81d1911e36f1ecd618c9dead86859";
14-
hash = "sha256-Pp3OP69KKrznOl1cY5yiKxMJRA7REe4S51zGDHG883c=";
13+
rev = "51ca5126ee67e88827c87c761a097a6318ad25e7";
14+
hash = "sha256-OBC8y53ljmgmfow7qBWIJYgjAiyv2bVa3CqQFkaJRhQ=";
1515
};
1616

1717
hardeningDisable = [ "format" ];

pkgs/applications/emulators/libretro/cores/fbneo.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
}:
66
mkLibretroCore {
77
core = "fbneo";
8-
version = "0-unstable-2025-04-05";
8+
version = "0-unstable-2025-04-15";
99

1010
src = fetchFromGitHub {
1111
owner = "libretro";
1212
repo = "fbneo";
13-
rev = "c21c0a0393a1cc68db7250022d18039a30de51f4";
14-
hash = "sha256-AZyYUftVHlxR+QHCsIcNI2hTIEDYeInYPdmum++EtpU=";
13+
rev = "ffdacc6a7ce719b6371ad0a6143ce46726ed5d25";
14+
hash = "sha256-Pdp/pPsZujbAK6pEE5LT6KCdJ/RFW1zR67bWvI/efJI=";
1515
};
1616

1717
makefile = "Makefile";

pkgs/applications/emulators/libretro/cores/flycast.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
}:
99
mkLibretroCore {
1010
core = "flycast";
11-
version = "0-unstable-2025-04-05";
11+
version = "0-unstable-2025-04-15";
1212

1313
src = fetchFromGitHub {
1414
owner = "flyinghead";
1515
repo = "flycast";
16-
rev = "3114394019fc0f772c29d0a1f5493fbdce4745b0";
17-
hash = "sha256-bp10601cfcsb62Vy88zIjFZ/yBUGVODEt96Me7XX5kY=";
16+
rev = "25a882341d5ebbf8124ddd2a7421592678dfac2e";
17+
hash = "sha256-N/7JZbEzYaOAoUShkmQd1G61ke1U3OSeFMXS0lqftYU=";
1818
fetchSubmodules = true;
1919
};
2020

pkgs/applications/emulators/libretro/cores/ppsspp.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
}:
1414
mkLibretroCore {
1515
core = "ppsspp";
16-
version = "0-unstable-2025-04-06";
16+
version = "0-unstable-2025-04-15";
1717

1818
src = fetchFromGitHub {
1919
owner = "hrydgard";
2020
repo = "ppsspp";
21-
rev = "031421ba4de8559f8bbdbd9367b29be28f6a45cb";
22-
hash = "sha256-eaXR/w0Iz9tmTgZKHVcZYXJbXaVPnYudSal0vcsQ9a0=";
21+
rev = "599edb24f01bbb7ce0e685e3c5585a02781549c7";
22+
hash = "sha256-cPalfNXV6U2jLCTqXedQzn9pyWiscaZrrQM32D70uYE=";
2323
fetchSubmodules = true;
2424
};
2525

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
lib,
3+
python3Packages,
4+
fetchPypi,
5+
}:
6+
7+
python3Packages.buildPythonApplication rec {
8+
pname = "alibuild";
9+
version = "1.17.18";
10+
pyproject = true;
11+
12+
src = fetchPypi {
13+
inherit pname version;
14+
hash = "sha256-771XCMYNJsQzD7rb/7q5rheeIL8X2bvMWwLkA40CJ9Y=";
15+
};
16+
17+
build-system = with python3Packages; [
18+
setuptools
19+
setuptools-scm
20+
];
21+
22+
nativeBuildInputs = with python3Packages; [ pip ];
23+
24+
dependencies = with python3Packages; [
25+
requests
26+
pyyaml
27+
boto3
28+
jinja2
29+
distro
30+
];
31+
32+
pythonRelaxDeps = [ "boto3" ];
33+
34+
doCheck = false;
35+
36+
meta = {
37+
homepage = "https://alisw.github.io/alibuild/";
38+
description = "Build tool for ALICE experiment software";
39+
license = lib.licenses.gpl3;
40+
maintainers = with lib.maintainers; [ ktf ];
41+
};
42+
}

pkgs/by-name/ca/cargo-shear/package.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
cargo-shear,
77
}:
88
let
9-
version = "1.1.12";
9+
version = "1.1.14";
1010
in
1111
rustPlatform.buildRustPackage {
1212
pname = "cargo-shear";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage {
1616
owner = "Boshen";
1717
repo = "cargo-shear";
1818
rev = "v${version}";
19-
hash = "sha256-FvZJ0RFa5b9BQuZ1fmkvJhZj59yAsKSkKoTE0Emzdos=";
19+
hash = "sha256-xGNIk/9UYU1F/Qj2tGvBb5rEZWjVoTyzk23OJE6seps=";
2020
};
2121

2222
useFetchCargoVendor = true;
23-
cargoHash = "sha256-sYRUyTdTT2+VJHuiY1apom+EQU1hR46fJ6TmwNapHb4=";
23+
cargoHash = "sha256-olnkcA9Vt1+yFzL2ntfDmO4rzMuJ0JjJVqCl15xcdDI=";
2424

2525
# https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
2626
SHEAR_VERSION = version;

pkgs/by-name/ch/checkov/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ with py.pkgs;
2525

2626
python3.pkgs.buildPythonApplication rec {
2727
pname = "checkov";
28-
version = "3.2.404";
28+
version = "3.2.405";
2929
pyproject = true;
3030

3131
src = fetchFromGitHub {
3232
owner = "bridgecrewio";
3333
repo = "checkov";
3434
tag = version;
35-
hash = "sha256-hxu2FAdLMm54b0SNiHcvdKgxmsDZtA9qEqD/c9vL3Yg=";
35+
hash = "sha256-bzHd1gR2YmTyM4D8+Ux8eCEUynN5qu4B/dAGZ6cHXYA=";
3636
};
3737

3838
pythonRelaxDeps = [

0 commit comments

Comments
 (0)