Merge master into staging-nixos (987d17c5) · Commits · nix / nixpkgs

nixos/modules/services/backup/borgmatic.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,16 @@ let
		}
		// d
		) s.mysql_databases;
		})
		// (lib.optionalAttrs (s ? sqlite_databases && s.sqlite_databases != [ ]) {
		sqlite_databases = map (
		d:
		{
		sqlite_command = lib.getExe pkgs.sqlite;
		sqlite_restore_command = lib.getExe pkgs.sqlite;
		}
		// d
		) s.sqlite_databases;
		});

		repository =

nixos/tests/os-prober.nix

+1 −4

Original line number	Diff line number	Diff line
		@@ -105,10 +105,7 @@ import ./make-test-python.nix (
		libxml2.bin
		libxslt.bin
		nixos-artwork.wallpapers.simple-dark-gray-bottom
		(nixos-rebuild-ng.override {
		withNgSuffix = false;
		withReexec = true;
		})
		nixos-rebuild-ng
		ntp
		perlPackages.ConfigIniFiles
		perlPackages.FileSlurp

pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@
		}:
		mkLibretroCore {
		core = "genesis-plus-gx";
		version = "0-unstable-2025-12-19";
		version = "0-unstable-2025-12-21";

		src = fetchFromGitHub {
		owner = "libretro";
		repo = "Genesis-Plus-GX";
		rev = "496615db04eb9fe83c9732d77768030bb2fa8553";
		hash = "sha256-PGwXBsyLlFjo776J9XxJ+bEexain+CLNXqKv6V+cg2I=";
		rev = "7c5819b7bd0b84c3265ee7dfcd7b90210ed7d687";
		hash = "sha256-3YrRWxKk6Uci5MKS5lQYU+edrLdsFYIAR6pTPXwiy8c=";
		};

		meta = {

pkgs/by-name/cd/cdrdao/package.nix

+10 −22

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		fetchurl,
		fetchFromGitHub,
		fetchpatch,
		autoreconfHook,
		pkg-config,
		libiconv,
		libvorbis,
		@@ -12,11 +13,13 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "cdrdao";
		version = "1.2.5";
		version = "1.2.6";

		src = fetchurl {
		url = "mirror://sourceforge/cdrdao/cdrdao-${finalAttrs.version}.tar.bz2";
		hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY=";
		src = fetchFromGitHub {
		owner = "cdrdao";
		repo = "cdrdao";
		tag = "rel_${lib.replaceString "." "_" finalAttrs.version}";
		hash = "sha256-XEaJsv3c/xPO6jclJBbTopOnYamIOlumD2B+hJZraEE=";
		};

		makeFlags = [
		@@ -26,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
		];

		nativeBuildInputs = [
		autoreconfHook
		pkg-config
		];

		@@ -38,22 +42,6 @@ stdenv.mkDerivation (finalAttrs: {

		hardeningDisable = [ "format" ];

		patches = [
		# Fix build on macOS SDK < 12
		# https://github.com/cdrdao/cdrdao/pull/19
		(fetchpatch {
		url = "https://github.com/cdrdao/cdrdao/commit/105d72a61f510e3c47626476f9bbc9516f824ede.patch";
		hash = "sha256-NVIw59CSrc/HcslhfbYQNK/qSmD4QbfuV8hWYhWelX4=";
		})

		# Fix undefined behaviour caused by uninitialized variable
		# https://github.com/cdrdao/cdrdao/pull/21
		(fetchpatch {
		url = "https://github.com/cdrdao/cdrdao/commit/251a40ab42305c412674c7c2d391374d91e91c95.patch";
		hash = "sha256-+nGlWw5rgc5Ns2l+6fQ4Hp2LbhO4R/I95h9WGIh/Ebw=";
		})
		];

		# we have glibc/include/linux as a symlink to the kernel headers,
		# and the magic '..' points to kernelheaders, and not back to the glibc/include
		postPatch = ''
		@@ -65,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {

		meta = {
		description = "Tool for recording audio or data CD-Rs in disk-at-once (DAO) mode";
		homepage = "https://cdrdao.sourceforge.net/";
		homepage = "https://github.com/cdrdao/cdrdao";
		platforms = lib.platforms.unix;
		license = lib.licenses.gpl2Plus;
		};

pkgs/by-name/db/dbcsr/package.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "dbcsr";
		version = "2.9.0";
		version = "2.9.1";

		src = fetchFromGitHub {
		owner = "cp2k";
		repo = "dbcsr";
		rev = "v${version}";
		hash = "sha256-ZhcatDG0bbl75P3YI5Kqg8lhbDZ8EHYaZSixky6KJyo=";
		hash = "sha256-F6EvpsPAJJvmEZQKJDW2Mk4Yo8VsQCD4CE2IqxpjyN8=";
		};

		postPatch = ''

Admin message