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

nixos/modules/services/mail/public-inbox.nix

+1 −2

Original line number	Diff line number	Diff line
		@@ -177,8 +177,7 @@ in
		description = lib.mdDoc "The email addresses of the public-inbox.";
		};
		options.url = mkOption {
		type = with types; nullOr str;
		default = null;
		type = types.nonEmptyStr;
		example = "https://example.org/lists/example-discuss";
		description = lib.mdDoc "URL where this inbox can be accessed over HTTP.";
		};

+3 −3

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

		buildGoModule rec {
		pname = "ocm";
		version = "0.1.66";
		version = "0.1.67";

		src = fetchFromGitHub {
		owner = "openshift-online";
		repo = "ocm-cli";
		rev = "v${version}";
		sha256 = "sha256-iOgDWqP9sFd5/0e5/+WP6R3PpJa8AiUE4EjI39HwWX8=";
		sha256 = "sha256-MNagqeT6Uw9fLl6gJ+2FYTRZ2rO2qTYi8SBDoOR9EUM=";
		};

		vendorHash = "sha256-yY/X0LVIH1ULegx8MIZyUxD1wPNxxISSCBxj9aY2wtA=";
		vendorHash = "sha256-4d8IGe/gTt4HAqyg05pYtAFfHp6NCmUBtfxRA64rEmM=";

		# Strip the final binary.
		ldflags = [ "-s" "-w" ];

+3 −5

Original line number	Diff line number	Diff line
		@@ -89,11 +89,9 @@ mkDerivation rec {
		] ++ lib.optionals (!withGui) [
		"--disable-qtgui"
		"--disable-x11mon"
		] ++ (if stdenv.isLinux then [
		"--with-inotify"
		] else [
		"--without-inotify"
		]);
		] ++ [
		(lib.withFeature stdenv.isLinux "inotify")
		];

		env.NIX_CFLAGS_COMPILE = toString [ "-DNIXPKGS" ];

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ buildPythonPackage rec {
		pythonImportsCheck = [ "k5test" ];

		meta = with lib; {
		broken = (stdenv.isLinux && stdenv.isAarch64) \|\| stdenv.isDarwin;
		broken = stdenv.isDarwin;
		description = "Library for setting up self-contained Kerberos 5 environment";
		homepage = "https://github.com/pythongssapi/k5test";
		license = licenses.mit;

+2 −2

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

		buildGoModule rec {
		pname = "esbuild";
		version = "0.18.3";
		version = "0.18.4";

		src = fetchFromGitHub {
		owner = "evanw";
		repo = "esbuild";
		rev = "v${version}";
		hash = "sha256-rWziaR3c4rRcXp2CLNWWC4Kc2woCXP/nrMOCsp/nc9Y=";
		hash = "sha256-sipZMwcYMyaI6STI7dZ5RXCtsvFCm2wSB+nspTZLpbk=";
		};

		vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";