Merge remote-tracking branch 'origin/master' into staging-next (10ceb7bb) · Commits · nix / nixpkgs

pkgs/by-name/jp/jp-zip-codes/package.nix

+3 −3

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

		stdenvNoCC.mkDerivation {
		pname = "jp-zip-code";
		version = "0-unstable-2025-09-01";
		version = "0-unstable-2025-10-01";

		# This package uses a mirror as the source because the
		# original provider uses the same URL for updated content.
		src = fetchFromGitHub {
		owner = "musjj";
		repo = "jp-zip-codes";
		rev = "87a760cee8a6b103d834197caca72c3392ccbcde";
		hash = "sha256-7vOcScEk4fKIeUa+FGCnBczlAwUC00E7EKQq7wQ2bUI=";
		rev = "9464f58fe654ada94f6f53e5338b5fb2b15e314a";
		hash = "sha256-G+uCQPW2e/DEAvAx3TYvPt0Dl2rM77WUmuPJ17voxUE=";
		};

		installPhase = ''

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "kubetail";
		version = "1.6.20";
		version = "1.6.21";

		src = fetchFromGitHub {
		owner = "johanhaleby";
		repo = "kubetail";
		rev = version;
		sha256 = "sha256-RbbZHKXRtbs42cCbw+xb8TLul6ebUeCiNclMFF39c3M=";
		sha256 = "sha256-Uzr63TkveJqfZl4USo0MNdlcvofxDp+o+reZmJG5F78=";
		};

		nativeBuildInputs = [

+2 −10

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@
		orc,
		pcre2,
		pkg-config,
		protobuf_21,
		python3,
		SDL2,
		shaderc,
		@@ -64,14 +63,7 @@
		serviceSupport ? true,
		tracingSupport ? false,
		}:
		let
		# For some reason protobuf 32 causes a segfault during startup
		# Pin to last (known) working version
		# See https://github.com/NixOS/nixpkgs/issues/439075
		opencv4' = opencv4.override {
		protobuf = protobuf_21;
		};
		in

		stdenv.mkDerivation (finalAttrs: {
		pname = "monado";
		version = "25.0.0";
		@@ -133,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
		libXext
		libXrandr
		onnxruntime
		opencv4'
		opencv4
		openhmd
		openvr
		orc