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

pkgs/applications/audio/pianoteq/default.nix

+3 −6

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		let
		versionForFile = v: builtins.replaceStrings ["."] [""] v;

		mkPianoteq = { name, src, version, archdir, ... }:
		mkPianoteq = { name, src, version, archdir ? if (stdenv.hostPlatform.system == "aarch64-linux") then "arm-64bit" else "x86-64bit", ... }:
		stdenv.mkDerivation rec {
		inherit src version;

		@@ -47,7 +47,7 @@ let
		homepage = "https://www.modartt.com/pianoteq";
		description = "Software synthesizer that features real-time MIDI-control of digital physically modeled pianos and related instruments";
		license = licenses.unfree;
		platforms = [ "x86_64-linux" ]; # TODO extract binary according to each platform?
		platforms = [ "x86_64-linux" "aarch64-linux" ];
		maintainers = [ maintainers.mausch ];
		};
		};
		@@ -169,7 +169,6 @@ in {
		stage-trial = mkPianoteq rec {
		name = "stage-trial";
		version = "8.0.8";
		archdir = "x86-64bit";
		src = fetchPianoteqTrial {
		name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
		sha256 = "sha256-dp0bTzzh4aQ2KQ3z9zk+3meKQY4YRYQ86rccHd3+hAQ=";
		@@ -178,7 +177,6 @@ in {
		standard-trial = mkPianoteq rec {
		name = "standard-trial";
		version = "8.0.8";
		archdir = "x86-64bit";
		src = fetchPianoteqTrial {
		name = "pianoteq_linux_trial_v${versionForFile version}.7z";
		sha256 = "sha256-LSrnrjkEhsX9TirUUFs9tNqH2A3cTt3I7YTfcTT6EP8=";
		@@ -187,7 +185,7 @@ in {
		stage-6 = mkPianoteq rec {
		name = "stage-6";
		version = "6.7.3";
		archdir = "amd64";
		archdir = if (stdenv.hostPlatform.system == "aarch64-linux") then throw "Pianoteq stage-6 is not supported on aarch64-linux" else "amd64";
		src = fetchPianoteqWithLogin {
		name = "pianoteq_stage_linux_v${versionForFile version}.7z";
		sha256 = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy";
		@@ -196,7 +194,6 @@ in {
		stage-7 = mkPianoteq rec {
		name = "stage-7";
		version = "7.3.0";
		archdir = "x86-64bit";
		src = fetchPianoteqWithLogin {
		name = "pianoteq_stage_linux_v${versionForFile version}.7z";
		sha256 = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx";

pkgs/applications/audio/qmidiarp/default.nix

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "qmidiarp";
		version = "0.6.5";
		version = "0.6.7";

		src = fetchgit {
		url = "https://git.code.sf.net/p/qmidiarp/code";
		sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9";
		sha256 = "sha256-CxElnyREXLR086xYxCQTHZumrLP52CDYvv+ougKqJz0=";
		rev = "qmidiarp-${version}";
		};

pkgs/applications/blockchains/lndhub-go/default.nix

+3 −3

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

		buildGoModule rec {
		pname = "lndhub-go";
		version = "0.13.0";
		version = "0.14.0";

		src = fetchFromGitHub {
		owner = "getAlby";
		repo = "lndhub.go";
		rev = "${version}";
		sha256 = "sha256-ZyqE6xFNsOwTBbLLn14jwNp9UkagTRgAQS+SEl+POaY=";
		sha256 = "sha256-m+Sc/rsYIbvd1oOqG4OT+wPtSxlgFq8m03n28eZIWJU=";
		};

		vendorHash = "sha256-Wsejz/vYaT/maN7dYcrXPTXg30jZaldaslXbHcgHlRs=";
		vendorHash = "sha256-a4yVuEfhLNM8IEYnafWf///SNLqQL5XZfGgJ5AZLx3c=";

		doCheck = false; # tests require networking

pkgs/applications/editors/standardnotes/src.json

+5 −5

Original line number	Diff line number	Diff line
		{
		"version": "3.151.3",
		"version": "3.154.1",
		"appimage": {
		"x86_64-linux": {
		"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.151.3/standard-notes-3.151.3-linux-x86_64.AppImage",
		"hash": "sha512-Wk31nB9OjR8E3cPFfh4KpUqQxXsnerzDt5TgaExXW4OeWLftv3ejyf2ROWXAoqG/8K87OclbunCqS3b2g8hAjA=="
		"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.154.1/standard-notes-3.154.1-linux-x86_64.AppImage",
		"hash": "sha512-eMKrRCMVEpgtKLuLTIIOkwDVKmkFFWqlAg2UXs+h8axQwKyEnnA6dGaWfQvE/NSQwgWvmZRJZNMUE2atTc9AAw=="
		},
		"aarch64-linux": {
		"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.151.3/standard-notes-3.151.3-linux-arm64.AppImage",
		"hash": "sha512-nPTpEJs978wxZjG1pN15ETgUBdGBzl574QHCQNo2ShYvhi9Uf38jCaGQIsY0d779eT8kSHuMBXoAiE/flxfWMQ=="
		"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.154.1/standard-notes-3.154.1-linux-arm64.AppImage",
		"hash": "sha512-6EllhNEaLPL/5Nmt1NxtU6x6wi7DnU+k7oyr1HaLWMmkE673vQTyYW+fyFRrxnyBUlmjG4i+ztWYEzxN8CBlqg=="
		}
		}
		}

pkgs/applications/misc/boatswain/default.nix

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitLab
		, meson
		, ninja
		, pkg-config
		, gtk4
		, libgee
		, libadwaita
		, wrapGAppsHook4
		, appstream-glib
		, desktop-file-utils
		, libpeas
		, libportal-gtk4
		, gusb
		, hidapi
		, json-glib
		, libsecret
		, libsoup_3
		}:

		stdenv.mkDerivation rec {
		pname = "boatswain";
		version = "0.3.0";

		src = fetchFromGitLab {
		domain = "gitlab.gnome.org";
		owner = "World";
		repo = "boatswain";
		rev = version;
		hash = "sha256-Q16ooTaCgwbwEqa0iRzAoaS5OHCSi6dXaiVgC3uc/zc=";
		};

		nativeBuildInputs = [
		meson
		ninja
		pkg-config
		wrapGAppsHook4
		appstream-glib
		desktop-file-utils
		];

		buildInputs = [
		gtk4
		libadwaita
		libgee
		libpeas
		libportal-gtk4
		gusb
		hidapi
		json-glib
		libsecret
		libsoup_3
		];

		meta = with lib; {
		description = "Control Elgato Stream Deck devices.";
		homepage = "https://gitlab.gnome.org/World/boatswain";
		mainProgram = "boatswain";
		license = licenses.gpl3Plus;
		platforms = platforms.unix;
		maintainers = with maintainers; [ _0xMRTT ];
		broken = stdenv.isDarwin;
		};
		}

Admin message