Merge master into staging-nixos (7476c13b) · Commits · nix / nixpkgs

nixos/modules/programs/wayland/uwsm.nix

+15 −12

Original line number	Diff line number	Diff line
		@@ -24,6 +24,19 @@ let
		passthru.providedSessions = [ "${opts.name}-uwsm" ];
		};
		});

		desktopEntries = lib.mapAttrsToList (
		name: value:
		mk_uwsm_desktop_entry {
		inherit name;
		inherit (value)
		prettyName
		comment
		binPath
		extraArgs
		;
		}
		) cfg.waylandCompositors;
		in
		{
		options.programs.uwsm = {
		@@ -126,18 +139,8 @@ in
		}

		(lib.mkIf (cfg.waylandCompositors != { }) {
		environment.systemPackages = lib.mapAttrsToList (
		name: value:
		mk_uwsm_desktop_entry {
		inherit name;
		inherit (value)
		prettyName
		comment
		binPath
		extraArgs
		;
		}
		) cfg.waylandCompositors;
		environment.systemPackages = desktopEntries;
		services.displayManager.sessionPackages = desktopEntries;
		})
		]
		);

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,8 +79,8 @@ rec {
		thunderbird-140 = common {
		applicationName = "Thunderbird ESR";

		version = "140.7.0esr";
		sha512 = "92746d87ca2d5a59082c25aa3c3a816e5bf24ae3e095f8ec478a60c5cd890faea392ff98b5b510cc9a89b155240dce9d06c7ddd0f17f564722acc65105fb6cd2";
		version = "140.7.1esr";
		sha512 = "2d0f61758b0428eb4eb8294c58d914e03842c9ad7685cd2eec26c723cc1491634f90fc9fcf5ad6d3f13738e141e96c692cd8ff1599869346e3247a0cae2349f4";

		updateScript = callPackage ./update.nix {
		attrPath = "thunderbirdPackages.thunderbird-140";

+2 −2

Original line number	Diff line number	Diff line
		@@ -6,13 +6,13 @@
		}:
		buildGoModule (finalAttrs: {
		pname = "bitrise";
		version = "2.37.0";
		version = "2.38.0";

		src = fetchFromGitHub {
		owner = "bitrise-io";
		repo = "bitrise";
		rev = "v${finalAttrs.version}";
		hash = "sha256-CxWFqrgj/oYsD3yBjR4fdh7FSAaGZnbC6OB9H1VH+m0=";
		hash = "sha256-WF6+HgGePOvwdo1nU75ifnH8Fddk1vmSyNOOQER4awo=";
		};

		# many tests rely on writable $HOME/.bitrise and require network access

+5 −4

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		cilium-cli,
		fetchFromGitHub,
		installShellFiles,
		writableTmpDirAsHomeHook,
		testers,
		}:

		@@ -21,6 +22,10 @@ buildGoModule (finalAttrs: {

		nativeBuildInputs = [ installShellFiles ];

		# Required to workaround install check error:
		# 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied
		nativeInstallCheckInputs = [ writableTmpDirAsHomeHook ];

		vendorHash = null;

		subPackages = [ "cmd/cilium" ];
		@@ -31,10 +36,6 @@ buildGoModule (finalAttrs: {
		"-X=github.com/cilium/cilium/cilium-cli/defaults.CLIVersion=${finalAttrs.version}"
		];

		# Required to workaround install check error:
		# 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied
		HOME = "$TMPDIR";

		postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
		installShellCompletion --cmd cilium \
		--bash <($out/bin/cilium completion bash) \

+8 −5

Original line number	Diff line number	Diff line
		@@ -15,11 +15,14 @@ stdenv.mkDerivation (finalAttrs: {
		url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${finalAttrs.version}.tar.gz";
		sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y";
		};

		env = {
		JAVA_HOME = jdk8;
		JAVA = "${jdk8}/bin/java";
		PREFIX = "\${out}";
		JAVAUNIXLIBDIR = "${libmatthew_java}/lib/jni";
		JAVAUNIXJARDIR = "${libmatthew_java}/share/java";
		};
		buildInputs = [
		gettext
		jdk8