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

nixos/modules/services/networking/fedimintd.nix

+8 −3

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ let
		};
		url = mkOption {
		type = types.str;
		example = "fedimint://p2p.myfedimint.com";
		example = "fedimint://p2p.myfedimint.com:8173";
		description = ''
		Public address for p2p connections from peers
		'';
		@@ -159,6 +159,12 @@ let
		example = "api.myfedimint.com";
		description = "Public domain of the API address of the reverse proxy/tls terminator.";
		};
		path = mkOption {
		type = types.str;
		example = "/";
		default = "/ws/";
		description = "Path to host the API on and forward to the daemon's api port";
		};
		config = mkOption {
		type = types.submodule (
		recursiveUpdate (import ../web-servers/nginx/vhost-options.nix {
		@@ -286,8 +292,7 @@ in
		# overriden by default value from vhost-options.nix
		enableACME = mkOverride 99 true;
		forceSSL = mkOverride 99 true;
		# Currently Fedimint API only support JsonRPC on `/ws/` endpoint, so no need to handle `/`
		locations."/ws/" = {
		locations.${cfg.nginx.path} = {
		proxyPass = "http://127.0.0.1:${toString cfg.api.port}/";
		proxyWebsockets = true;
		extraConfig = ''

pkgs/applications/networking/instant-messengers/wire-desktop/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		, stdenv
		, lib
		, udev
		, wrapGAppsHook3
		, buildPackages
		, cpio
		, xar
		, libdbusmenu
		@@ -97,7 +97,7 @@ let
		autoPatchelfHook
		dpkg
		makeWrapper
		wrapGAppsHook3
		(buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
		];

		buildInputs = [
		@@ -137,7 +137,7 @@ let
		];

		preFixup = ''
		gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --ozone-platform=wayland --enable-features=WaylandWindowDecorations}}")
		gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}")
		'';

		postFixup = ''

pkgs/applications/networking/remote/teamviewer/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ mkDerivation rec {

		src =
		let
		base_url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x";
		base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major version}x";
		in
		{
		x86_64-linux = fetchurl {

pkgs/applications/science/biology/picard-tools/default.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "picard-tools";
		version = "3.2.0";
		version = "3.3.0";

		src = fetchurl {
		url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
		sha256 = "sha256-4lj6Lj9fphzWeZ7I4HP0mpX73OrxY9imCXGyYZuG+kE=";
		sha256 = "sha256-WIGadmBka3SzTigvXU0hyNuuoi3e/5bjJYdV2voPhtw=";
		};

		nativeBuildInputs = [ makeWrapper ];

pkgs/applications/video/makemkv/default.nix

+39 −7

Original line number	Diff line number	Diff line
		{
		lib,
		mkDerivation,
		fetchurl,
		autoPatchelfHook,
		pkg-config,
		common-updater-scripts,
		curl,
		fetchurl,
		ffmpeg,
		lib,
		mkDerivation,
		openssl,
		pkg-config,
		qtbase,
		rubyPackages,
		writeShellApplication,
		zlib,

		withJava ? true,
		@@ -15,21 +18,21 @@
		}:

		let
		version = "1.17.7";
		version = "1.17.8";
		# Using two URLs as the first one will break as soon as a new version is released
		src_bin = fetchurl {
		urls = [
		"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
		"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
		];
		hash = "sha256-jFvIMbyVKx+HPMhFDGTjktsLJHm2JtGA8P/JZWaJUdA=";
		hash = "sha256-jg9UdDDZr+7ZdseJtb7N+y7Prhyq3hLo4+EZpzRxcEE=";
		};
		src_oss = fetchurl {
		urls = [
		"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
		"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
		];
		hash = "sha256-di5VLUb57HWnxi3LfZfA/Z5qFRINDvb1oIDO4pHToO8=";
		hash = "sha256-knUrzj/J+Xk5N1tg0q9iIXT+hqStkkjL3Yc2Yp5tvIo=";
		};
		in
		mkDerivation {
		@@ -83,6 +86,35 @@ mkDerivation {
		runHook postInstall
		'';

		passthru = {
		srcs = {
		inherit src_bin src_oss;
		};
		updateScript = lib.getExe (writeShellApplication {
		name = "update-makemkv";
		runtimeInputs = [
		common-updater-scripts
		curl
		rubyPackages.nokogiri
		];
		text = ''
		get_version() {
		# shellcheck disable=SC2016
		curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \
		\| nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]'
		}
		oldVersion=${lib.escapeShellArg version}
		newVersion=$(get_version)
		if [[ $oldVersion == "$newVersion" ]]; then
		echo "$0: New version same as old version, nothing to do." >&2
		exit
		fi
		update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_bin
		update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_oss --ignore-same-version
		'';
		});
		};

		meta = with lib; {
		description = "Convert blu-ray and dvd to mkv";
		longDescription = ''