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

pkgs/applications/networking/cluster/terraform-providers/providers.json

+7 −7

Original line number	Diff line number	Diff line
		@@ -363,11 +363,11 @@
		"vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
		},
		"equinix_equinix": {
		"hash": "sha256-WjJxZzrsyHHjsVK4pZf3ByTcFBXbIlw7JiMp9uMv19I=",
		"hash": "sha256-qF3v9sol5/pdK+WCsz69eT/xAwsSfjnCjKTa+AXuBUI=",
		"homepage": "https://registry.terraform.io/providers/equinix/equinix",
		"owner": "equinix",
		"repo": "terraform-provider-equinix",
		"rev": "v4.7.0",
		"rev": "v4.10.0",
		"spdx": "MIT",
		"vendorHash": "sha256-GEdgHY2cIiXxeIYev7zbGd4c+IyZZfeZtSj9Z/gG6E4="
		},
		@@ -561,13 +561,13 @@
		"vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
		},
		"hashicorp_google": {
		"hash": "sha256-sGdKvVyQkYVM2zZ6fVgUr2ANgQVwJjvlcbSUAUagsqU=",
		"hash": "sha256-PoPYcCr66g+3S94q0SprdQokgVkFM1p3oYSBEMOdSWY=",
		"homepage": "https://registry.terraform.io/providers/hashicorp/google",
		"owner": "hashicorp",
		"repo": "terraform-provider-google",
		"rev": "v7.9.0",
		"rev": "v7.10.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84="
		"vendorHash": "sha256-BghusRVsU7HrX6hWpbanGJ93UdHSq8nWmcEGnyyVOTs="
		},
		"hashicorp_google-beta": {
		"hash": "sha256-j8CDyKV43rmxA6wyF1luO95AJCY5jpz9suUVLKWUVQo=",
		@@ -1120,11 +1120,11 @@
		"vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc="
		},
		"rancher_rancher2": {
		"hash": "sha256-E1E7xrQUOGbGV1xNpZFrIql6zgfzr3jmCbIFREbJdwE=",
		"hash": "sha256-vFsnbB35rL8U/4b/53SeuDXr+3GT/aVphKRB5H1B/Z8=",
		"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
		"owner": "rancher",
		"repo": "terraform-provider-rancher2",
		"rev": "v8.2.1",
		"rev": "v8.3.1",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
		},

pkgs/by-name/ed/edmarketconnector/package.nix

+6 −3

Original line number	Diff line number	Diff line
		@@ -24,13 +24,13 @@ let
		in
		stdenv.mkDerivation (finalAttrs: {
		pname = "edmarketconnector";
		version = "5.13.1";
		version = "5.13.2";

		src = fetchFromGitHub {
		owner = "EDCD";
		repo = "EDMarketConnector";
		tag = "Release/${finalAttrs.version}";
		hash = "sha256-50OPbAXrDKodN0o6UibGUmMqQ/accF2/gNHnms+8rOI=";
		hash = "sha256-BqzrW5pV9ty1MBaILQir+iOda2xQoJeTq8eZG0x6+90=";
		};

		nativeBuildInputs = [ makeWrapper ];
		@@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
		license = lib.licenses.gpl2Only;
		platforms = lib.platforms.x86_64;
		mainProgram = "edmarketconnector";
		maintainers = with lib.maintainers; [ jiriks74 ];
		maintainers = with lib.maintainers; [
		jiriks74
		toasteruwu
		];
		};
		})

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

+3 −3

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

		rustPlatform.buildRustPackage (finalAttrs: {
		pname = "monocle";
		version = "0.9.0";
		version = "0.9.1";

		src = fetchFromGitHub {
		owner = "bgpkit";
		repo = "monocle";
		tag = "v${finalAttrs.version}";
		hash = "sha256-7p7asmCHKFAHElYuRKs6BPG7Al3J36sJEss+hDEVQRI=";
		hash = "sha256-64oa3rmPR1PFmtGti1LVubO+2lY4VIkdMBKP6/IeyFk=";
		};

		cargoHash = "sha256-nGeAHIn076WkVnab7lUn4K1/TQ01Bgk/huxm12pzzkQ=";
		cargoHash = "sha256-rSvq+aHI5u0W1RG3JQooljeDmxTHE9ywdPguHdV3T+c=";

		# require internet access
		checkFlags = [

pkgs/by-name/sd/sdl3/package.nix

+11 −1

Original line number	Diff line number	Diff line
		@@ -171,6 +171,16 @@ stdenv.mkDerivation (finalAttrs: {
		(lib.cmakeBool "SDL_TESTS" true)
		(lib.cmakeBool "SDL_INSTALL_TESTS" true)
		(lib.cmakeBool "SDL_DEPS_SHARED" false)
		]
		++
		lib.optionals
		(
		stdenv.hostPlatform.isUnix
		&& !(stdenv.hostPlatform.isDarwin \|\| stdenv.hostPlatform.isAndroid)
		&& !(x11Support \|\| waylandSupport)
		)
		[
		(lib.cmakeBool "SDL_UNIX_CONSOLE_BUILD" true)
		];

		doCheck = true;