Merge master into staging-next (923f6e16) · Commits · nix / nixpkgs

nixos/modules/services/networking/ntp/ntpd.nix

+5 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,11 @@ let
		restrict 127.0.0.1
		restrict -6 ::1

		${toString (map (server: "server " + server + " iburst\n") cfg.servers)}
		${toString (
		map (
		server: "${if lib.strings.hasInfix "pool" server then "pool" else "server"} " + server + " iburst\n"
		) cfg.servers
		)}

		${cfg.extraConfig}
		'';

pkgs/by-name/br/brainflow/package.nix

+2 −2

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

		stdenv.mkDerivation (finalAttrs: {
		pname = "brainflow";
		version = "5.18.1";
		version = "5.19.0";

		src = fetchFromGitHub {
		owner = "brainflow-dev";
		repo = "brainflow";
		tag = finalAttrs.version;
		hash = "sha256-VcWYH7DXpm0I8IgeDUTFs/13NfEIR5Q74iKFbFWReIA=";
		hash = "sha256-XoTd7pEsY2RuMQFj5zo9NhlYgiG0J0aEMdKuxtDuaFg=";
		};

		patches = [ ];

pkgs/by-name/mo/motoc/package.nix

+3 −3

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

		rustPlatform.buildRustPackage rec {
		pname = "motoc";
		version = "0.3.4";
		version = "0.3.5";

		src = fetchFromGitHub {
		owner = "galister";
		repo = "motoc";
		tag = "v${version}";
		hash = "sha256-CAKgh9uddDhaFp2O62o1nNZ/ZWJbCR/7dMaI9V992Xk=";
		hash = "sha256-ozC7Az7G7qGsGURJ6UaM6VZH4PEUTknYDPShtXEKmrA=";
		};

		cargoHash = "sha256-RDzPvHlXuNLv3GiaGSYCyvbhdmxQkjUtwPq/e5NloOg=";
		cargoHash = "sha256-Owv0OTbBpsd6xvadVOu3F3JAmo6SPdwzT3MOAP54nPY=";

		buildInputs = [
		openxr-loader

pkgs/by-name/vr/vrcx/package.nix

+14 −11

Original line number	Diff line number	Diff line
		@@ -11,35 +11,38 @@
		stdenv,
		}:
		let
		dotnet = dotnetCorePackages.dotnet_9;
		electron = electron_37;
		dotnet = dotnetCorePackages.dotnet_9;
		in
		buildNpmPackage (finalAttrs: {
		pname = "vrcx";
		version = "2025.09.10";
		version = "2025.10.11";

		src = fetchFromGitHub {
		owner = "vrcx-team";
		repo = "VRCX";
		rev = "b233bbc299fca9a956db387b83d90a4dbba61175";
		hash = "sha256-7axYnsImG+VllQE1rhr8NmuMCm5t3bgNYGIIn9j2wMk=";
		owner = "vrcx-team";
		rev = "cb6bc979d9371b89b289b6cb0bb8b6f60b350bc7";
		hash = "sha256-0LnFXSLyby5b2gSIse7Qld4cQlwNAFHSuGGqk6B9TZY=";
		};

		npmDepsHash = "sha256-VFYWXPhZrg3q2PW4kWfVr5/DY8W6Uf1mvnwfB4mVBrs=";
		npmFlags = [ "--ignore-scripts" ];
		makeCacheWritable = true;
		npmFlags = [ "--ignore-scripts" ];
		npmDepsHash = "sha256-giWeXrsiFaZOh5zs7L4L0w3wcnD/F3TyrMM/POfOTvE=";

		nativeBuildInputs = [
		makeWrapper
		copyDesktopItems
		];

		preBuild = ''
		# Build fails at executing dart from sass-embedded
		rm -r node_modules/sass-embedded*
		'';

		buildPhase = ''
		runHook preBuild

		# need to run vue-demi postinstall for pinia
		node ./node_modules/vue-demi/scripts/postinstall.js
		env PLATFORM=linux npm exec webpack -- --config webpack.config.js --mode production
		env PLATFORM=linux npm exec vite build src
		node ./src-electron/patch-package-version.js
		npm exec electron-builder -- --dir \
		-c.electronDist=${electron.dist} \
		@@ -64,7 +67,7 @@ buildNpmPackage (finalAttrs: {
		--set DOTNET_ROOT ${dotnet.runtime}/share/dotnet \
		--prefix PATH : ${lib.makeBinPath [ dotnet.runtime ]}

		install -Dm644 VRCX.png "$out/share/icons/hicolor/256x256/apps/vrcx.png"
		install -Dm644 images/VRCX.png "$out/share/icons/hicolor/256x256/apps/vrcx.png"

		runHook postInstall
		'';

pkgs/by-name/wo/worker-build/package.nix

+0 −3

Original line number	Diff line number	Diff line
		@@ -20,9 +20,6 @@ rustPlatform.buildRustPackage rec {

		buildAndTestSubdir = "worker-build";

		# missing some module upstream to run the tests
		doCheck = false;

		meta = {
		description = "Tool to be used as a custom build command for a Cloudflare Workers `workers-rs` project";
		mainProgram = "worker-build";