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

pkgs/applications/audio/pianoteq/default.nix

+27 −19

Original line number	Diff line number	Diff line
		{ lib, stdenv, curl, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
		{ lib, stdenv, curl, jq, htmlq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }:
		let
		versionForFile = v: builtins.replaceStrings ["."] [""] v;

		@@ -93,10 +93,14 @@ let
		fetchWithCurlScript {
		inherit name sha256;
		script = ''
		html=$(
		"''${curl[@]}" --silent --request GET \
		--cookie cookies \
		--header "accept: /" \
		https://www.modartt.com/ -o /dev/null
		'https://www.modartt.com/try?file=${name}'
		)

		signature="$(echo "$html" \| ${htmlq}/bin/htmlq '#download-form' --attribute action \| cut -f2 -d'&' \| cut -f2 -d=)"

		json=$(
		"''${curl[@]}" --silent --request POST \
		@@ -105,11 +109,15 @@ let
		--header "origin: https://www.modartt.com" \
		--header "content-type: application/json; charset=UTF-8" \
		--header "accept: application/json, text/javascript, /" \
		--data-raw '{"file": "${name}", "get": "url"}' \
		--data-raw '{"file": "${name}", "get": "url", "signature": "'"$signature"'"}' \
		https://www.modartt.com/api/0/download
		)

		url=$(echo $json \| ${jq}/bin/jq -r .url)
		if [ "$url" == "null" ]; then
		echo "Could not get download URL, open an issue on https://github.com/NixOS/nixpkgs"
		return 1
		fi
		"''${curl[@]}" --progress-bar --cookie cookies -o $out "$url"
		'';
		};
		@@ -160,20 +168,20 @@ in {
		# TODO currently can't install more than one because `lame` clashes
		stage-trial = mkPianoteq rec {
		name = "stage-trial";
		version = "8.0.5";
		version = "8.0.8";
		archdir = "x86-64bit";
		src = fetchPianoteqTrial {
		name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
		sha256 = "sha256-9Lo4e1SM1gw2/+TmpDUdZCOQcHEpT/aaG6P80/GRPQY=";
		sha256 = "sha256-dp0bTzzh4aQ2KQ3z9zk+3meKQY4YRYQ86rccHd3+hAQ=";
		};
		};
		standard-trial = mkPianoteq rec {
		name = "standard-trial";
		version = "8.0.5";
		version = "8.0.8";
		archdir = "x86-64bit";
		src = fetchPianoteqTrial {
		name = "pianoteq_linux_trial_v${versionForFile version}.7z";
		sha256 = "sha256-qxViVIbld8zTMj1+TIfOsIOhmujOGJux2/u2J4hvsqw=";
		sha256 = "sha256-LSrnrjkEhsX9TirUUFs9tNqH2A3cTt3I7YTfcTT6EP8=";
		};
		};
		stage-6 = mkPianoteq rec {

pkgs/applications/backup/unifi-protect-backup/default.nix

+2 −2

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

		python3.pkgs.buildPythonApplication rec {
		pname = "unifi-protect-backup";
		version = "0.9.0";
		version = "0.9.1";

		format = "pyproject";

		@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
		owner = "ep1cman";
		repo = pname;
		rev = "refs/tags/v${version}";
		hash = "sha256-yPYzFZ4eI1wvBZgSP4Z90zyS+0vrDtf0uRz60byE5XA=";
		hash = "sha256-L7uM5v2CYGFHYxzBUKlMF+ChtjBM24GZ8NuyoQaOU6U=";
		};

		pythonRelaxDeps = [

pkgs/applications/graphics/pineapple-pictures/default.nix

+6 −2

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

		stdenv.mkDerivation rec {
		pname = "pineapple-pictures";
		version = "0.6.6";
		version = "0.6.9";

		src = fetchFromGitHub {
		owner = "BLumia";
		repo = "pineapple-pictures";
		rev = version;
		sha256 = "sha256-p51FlCeViDRNGUDN//IT4bLJpP2kU0CC67BCAlm0rYk=";
		sha256 = "sha256-QFKo4zMqhKzFseXMnZEBd2DPo0QObpelvYmI2tMyfRE=";
		};

		nativeBuildInputs = [
		@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
		exiv2
		];

		cmakeFlags = [
		"-DPREFER_QT_5=OFF"
		];

		meta = with lib; {
		description = "Homebrew lightweight image viewer";
		homepage = "https://github.com/BLumia/pineapple-pictures";

pkgs/applications/misc/flavours/default.nix

+3 −3

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

		rustPlatform.buildRustPackage rec {
		pname = "flavours";
		version = "0.7.0";
		version = "0.7.1";

		src = fetchFromGitHub {
		owner = "Misterio77";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-48f05kIojCCANxV2rGmyXvGVqID2Wy0uh/YavR8d3XI=";
		hash = "sha256-SOsHvcfDdUpb0x5VZ1vZJnGaIiWWOPgnAwKYNXzfUfI=";
		};

		buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

		cargoHash = "sha256-YeIiyyGjjXoyuQ2td393LuiyvDmLZdoWf2BGYWqynD4=";
		cargoHash = "sha256-aimPeGIE5jP0pdrqwnzUzBqW0jz9+kcfpLdCN0r30xU=";

		nativeBuildInputs = [ installShellFiles ];

pkgs/applications/misc/obsidian/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		let
		inherit (stdenv.hostPlatform) system;
		pname = "obsidian";
		version = "1.1.16";
		version = "1.2.7";
		appname = "Obsidian";
		meta = with lib; {
		description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
		@@ -25,7 +25,7 @@ let
		filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
		src = fetchurl {
		url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
		sha256 = if stdenv.isDarwin then "sha256-0p9vYHd1+kH+2ZTJ5OPeIEKNOzUGRU/M1xlmtyPOvJo=" else "sha256-zO5RpRkatGd5kJTPrTQ5xAYHntyw/7aQUSpZFUnDMnw=";
		sha256 = if stdenv.isDarwin then "sha256-E+1B+KgdvOuDyJP4W5tnkDe8sC4NdplRqY24Yu/DlEA=" else "sha256-TDgi0jwNRL0zXJSIBap0Q8WX29ab2HhY0ylb/sxgapE=";
		};

		icon = fetchurl {

Admin message