Merge master into staging-nixos (306919f6) · Commits · nix / nixpkgs

nixos/tests/phosh.nix

+8 −7

Original line number	Diff line number	Diff line
		@@ -54,11 +54,16 @@ in
		import time

		start_all()

		# Prevent the RTC from setting the time to an undesired value after we already set it to a different value
		phone.wait_for_file("/dev/rtc0")
		phone.succeed("hwclock --set --date '2022-01-01 07:00'")

		phone.wait_for_unit("phosh.service")

		with subtest("Check that we can see the lock screen info page"):
		# Saturday, January 1
		phone.succeed("timedatectl set-time '2022-01-01 07:00'")
		phone.succeed("date -s '2022-01-01 07:00'")

		phone.wait_for_text("Saturday")
		phone.screenshot("01lockinfo")
		@@ -73,14 +78,10 @@ in
		phone.wait_for_text("All Apps")
		phone.screenshot("03launcher")

		with subtest("Check the on-screen keyboard shows"):
		phone.send_chars("mobile setting", delay=0.2)
		phone.wait_for_text("123") # A button on the OSK
		phone.screenshot("04osk")

		with subtest("Check mobile-phosh-settings starts"):
		phone.send_chars("mobile setting", delay=0.2)
		phone.send_chars("\n")
		phone.wait_for_text("Tweak advanced mobile settings");
		phone.screenshot("05settings")
		phone.screenshot("04settings")
		'';
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@
		}:
		mkLibretroCore {
		core = "prboom";
		version = "0-unstable-2026-03-31";
		version = "0-unstable-2026-04-10";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "libretro-prboom";
		rev = "535b8315e42f22887f36715de3ffc72b34d2dad5";
		hash = "sha256-aAlGfOcjVB1nOnA+QjVB2VfPX0Ry71QENfxIFdf/L18=";
		rev = "79d35037b742532e273b82088efad9c5c0af8a6d";
		hash = "sha256-BR1orEzjT8NQF59uPfHt6WlXwb23bDRnUV8F2itc/HM=";
		};

		makefile = "Makefile";

pkgs/applications/networking/cluster/helm/default.nix

+8 −3

Original line number	Diff line number	Diff line
		@@ -9,15 +9,15 @@

		buildGoModule (finalAttrs: {
		pname = "kubernetes-helm";
		version = "3.19.1";
		version = "3.20.1";

		src = fetchFromGitHub {
		owner = "helm";
		repo = "helm";
		rev = "v${finalAttrs.version}";
		sha256 = "sha256-1Cc7W6qyawcg5ZfjsGWH7gScdRhcYpqppjzD83QWV60=";
		sha256 = "sha256-fSMfHJCl2/Lc6mcYn/m0kR0viH88rRgRTMOoJjFVERQ=";
		};
		vendorHash = "sha256-81qCRwp57PpzK/eavycOLFYsuD8uVq46h12YVlJRK7Y=";
		vendorHash = "sha256-kqx23LekpuZJFisVZUoXBY9vHh9zviKyaW5NSa4ecxM=";

		subPackages = [ "cmd/helm" ];
		ldflags = [
		@@ -39,6 +39,11 @@ buildGoModule (finalAttrs: {
		ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
		'';

		overrideModAttrs = _: {
		# the goModules derivation will otherwise inherit the preBuild phase defined above
		preBuild = "";
		};

		__darwinAllowLocalNetworking = true;

		preCheck = ''

pkgs/by-name/be/bepasty/package.nix

+8 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,14 @@ let
		bepastyPython = python3.override {
		self = bepastyPython;
		packageOverrides = self: super: {
		xstatic-bootstrap = super.xstatic-bootstrap.overridePythonAttrs (oldAttrs: rec {
		version = "4.5.3.1";
		src = oldAttrs.src.override {
		pname = "XStatic-Bootstrap";
		inherit version;
		hash = "sha256-z2fSBUN7MlCKiLaafnxbviylqK5xCXORpqb1EOv9KCA=";
		};
		});
		xstatic-font-awesome = super.xstatic-font-awesome.overridePythonAttrs (oldAttrs: rec {
		version = "4.7.0.0";
		src = oldAttrs.src.override {

pkgs/by-name/ca/caido-cli/package.nix

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchurl,
		autoPatchelfHook,
		unzip,
		libgcc,
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "caido-cli";
		version = "0.55.3";

		src = fetchurl (
		{
		x86_64-linux = {
		url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-x86_64.tar.gz";
		hash = "sha256-ys5gMO0jGy5d8ncwQo9ES0gn7Ddckf3496CAyGgKEus=";
		};
		aarch64-linux = {
		url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-aarch64.tar.gz";
		hash = "sha256-JvWktRnNyzu98NeSOFJ6nhF60uQfSL6ys5BmTkYuwCQ=";
		};
		x86_64-darwin = {
		url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-x86_64.zip";
		hash = "sha256-bnFGa8GMDTdCjk9xJL9rGvZ1H6MMzzXrlWXGRlE5XPg=";
		};
		aarch64-darwin = {
		url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-aarch64.zip";
		hash = "sha256-UVBQKkGsYJ84cthFkCXrHI85t8LJPy4z5sP5TobVNeA=";
		};
		}
		.${stdenv.hostPlatform.system}
		or (throw "caido-cli: unsupported system ${stdenv.hostPlatform.system}")
		);

		nativeBuildInputs =
		lib.optionals stdenv.isLinux [ autoPatchelfHook ] ++ lib.optionals stdenv.isDarwin [ unzip ];

		buildInputs = lib.optionals stdenv.isLinux [ libgcc ];

		sourceRoot = ".";

		installPhase = ''
		runHook preInstall
		install -m 755 -D caido-cli $out/bin/caido-cli
		runHook postInstall
		'';

		meta = {
		description = "Caido CLI — lightweight web security auditing toolkit";
		homepage = "https://caido.io/";
		changelog = "https://github.com/caido/caido/releases/tag/v${finalAttrs.version}";
		license = lib.licenses.unfree;
		mainProgram = "caido-cli";
		maintainers = with lib.maintainers; [
		blackzeshi
		m0streng0
		octodi
		];
		platforms = [
		"x86_64-linux"
		"aarch64-linux"
		"x86_64-darwin"
		"aarch64-darwin"
		];
		sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
		};
		})

Admin message