Merge master into staging-next (802816b5) · Commits · nix / nixpkgs

nixos/modules/installer/sd-card/sd-image.nix

+26 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		with lib;

		let
		rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix (
		rootfsImage = pkgs.callPackage config.sdImage.rootFilesystemCreator (
		{
		inherit (config.sdImage) storePaths;
		compressImage = config.sdImage.compressImage;
		@@ -128,6 +128,29 @@ in
		'';
		};

		rootFilesystemCreator = mkOption {
		type = types.oneOf [
		types.package
		types.path
		];
		default = ../../../lib/make-ext4-fs.nix;
		example = ''
		nixpkgs/nixos/lib/make-btrfs-fs.nix
		'';
		description = ''
		The filesystem creator used for the root partition.
		'';
		};

		rootFilesystemImage = mkOption {
		type = types.package;
		default = rootfsImage;
		description = ''
		The finished root partition image with all custom fileystem modifications.
		Used to override the filesystem creator itself.
		'';
		};

		firmwareSize = mkOption {
		type = types.int;
		# As of 2019-08-18 the Raspberry pi firmware + u-boot takes ~18MiB
		@@ -254,11 +277,11 @@ in
		echo "file sd-image $img" >> $out/nix-support/hydra-build-products
		fi

		root_fs=${rootfsImage}
		root_fs=${config.sdImage.rootFilesystemImage}
		${lib.optionalString config.sdImage.compressImage ''
		root_fs=./root-fs.img
		echo "Decompressing rootfs image"
		zstd -d --no-progress "${rootfsImage}" -o $root_fs
		zstd -d --no-progress "${config.sdImage.rootFilesystemImage}" -o $root_fs
		''}

		# Gap in front of the first partition, in MiB

pkgs/by-name/bu/burpsuite/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,20 +9,20 @@
		}:

		let
		version = "2025.10.3";
		version = "2025.10.4";

		product =
		if proEdition then
		{
		productName = "pro";
		productDesktop = "Burp Suite Professional Edition";
		hash = "sha256-4XGIFjklYfHBJ/HIdJ7C1eTpLAq0nC3VSP6O/R3tdJw=";
		hash = "sha256-Y6VeAAKeVxS0LclD9xu56KIiMK7FjlTHAhjtt5m6S2I=";
		}
		else
		{
		productName = "community";
		productDesktop = "Burp Suite Community Edition";
		hash = "sha256-28dsTC0AEHT6IO9he1Rc3xglnf8epdXJitZ1BdCLrYE=";
		hash = "sha256-cHnQmhiSl/c0HteD+LED2wjvDvdJJmgDD00CynFdkB0=";
		};

		src = fetchurl {

pkgs/by-name/cb/cbmc/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,13 +17,13 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "cbmc";
		version = "6.7.1";
		version = "6.8.0";

		src = fetchFromGitHub {
		owner = "diffblue";
		repo = "cbmc";
		tag = "cbmc-${finalAttrs.version}";
		hash = "sha256-GUY4Evya0GQksl0R4b01UDSvoxUEOOeq4oOIblmoF5o=";
		hash = "sha256-PT6AYiwkplCeyMREZnGZA0BKl4ZESRC02/9ibKg7mYU=";
		};

		srcglucose = fetchFromGitHub {

pkgs/by-name/cl/clickhouse/package.nix

+3 −3

Original line number	Diff line number	Diff line
		import ./generic.nix {
		version = "25.10.1.3832-stable";
		rev = "f95c1af632a1c4fb9c69a501d05ae04a393b8f81";
		hash = "sha256-00QqO7fVEg7vGtM/+69CEPfNKTm+P2uteoHKKVYwpoY=";
		version = "25.10.2.65-stable";
		rev = "4ff630944f84ed44067d3fb37d5435de8ced10ce";
		hash = "sha256-JbnuzEcL6cz/UKjWjZj4KoRyeoheOIaTswuzaIiem4g=";
		lts = false;
		}

pkgs/by-name/cr/craftos-pc/package.nix

+26 −14

Original line number	Diff line number	Diff line
		@@ -44,8 +44,10 @@ stdenv.mkDerivation rec {
		};

		nativeBuildInputs = [
		patchelf
		unzip
		]
		++ lib.optionals stdenv.hostPlatform.isLinux [
		patchelf
		];
		buildInputs = [
		poco
		@@ -56,6 +58,8 @@ stdenv.mkDerivation rec {
		libpng
		pngpp
		libwebp
		]
		++ lib.optionals stdenv.hostPlatform.isLinux [
		libX11
		];
		strictDeps = true;
		@@ -63,7 +67,7 @@ stdenv.mkDerivation rec {
		preBuild = ''
		cp -R ${craftos2-lua}/* ./craftos2-lua/
		chmod -R u+w ./craftos2-lua
		make -C craftos2-lua linux
		make -C craftos2-lua ${if stdenv.hostPlatform.isDarwin then "macosx" else "linux"}
		'';

		buildPhase = ''
		@@ -83,11 +87,18 @@ stdenv.mkDerivation rec {
		installPhase = ''
		mkdir -p $out/bin $out/lib $out/share/craftos $out/include
		DESTDIR=$out/bin make install
		cp ./craftos2-lua/src/liblua.so $out/lib
		patchelf --replace-needed craftos2-lua/src/liblua.so liblua.so $out/bin/craftos
		cp ./craftos2-lua/src/liblua${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
		${lib.optionalString stdenv.hostPlatform.isDarwin ''
		chmod +w $out/bin/craftos
		install_name_tool -change liblua${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblua${stdenv.hostPlatform.extensions.sharedLibrary} $out/bin/craftos
		''}
		${lib.optionalString stdenv.hostPlatform.isLinux ''
		patchelf --replace-needed craftos2-lua/src/liblua${stdenv.hostPlatform.extensions.sharedLibrary} liblua${stdenv.hostPlatform.extensions.sharedLibrary} $out/bin/craftos
		''}
		cp -R api $out/include/CraftOS-PC
		cp -R ${craftos2-rom}/* $out/share/craftos

		${lib.optionalString stdenv.hostPlatform.isLinux ''
		mkdir -p resources/linux-icons
		unzip resources/linux-icons.zip -d resources/linux-icons
		for dim in 16 24 32 48 64 96 128 256 1024; do
		@@ -98,6 +109,7 @@ stdenv.mkDerivation rec {

		mkdir -p $out/share/applications
		cp resources/linux-icons/CraftOS-PC.desktop $out/share/applications/CraftOS-PC.desktop
		''}
		'';

		passthru.tests = {
		@@ -112,7 +124,7 @@ stdenv.mkDerivation rec {
		mit
		free
		];
		platforms = platforms.linux;
		platforms = platforms.linux ++ platforms.darwin;
		maintainers = with maintainers; [
		siraben
		tomodachi94

Admin message