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

pkgs/applications/audio/geonkick/default.nix

+7 −6

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchFromGitLab, cmake, pkg-config, libsndfile, rapidjson
		, libjack2, lv2, libX11, cairo }:
		, libjack2, lv2, libX11, cairo, openssl }:

		stdenv.mkDerivation rec {
		pname = "geonkick";
		version = "2.9.1";
		version = "3.3.1";

		src = fetchFromGitLab {
		owner = "iurie-sw";
		owner = "Geonkick-Synthesizer";
		repo = pname;
		rev = "v${version}";
		sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8=";
		sha256 = "sha256-fsDoqQqZsoeQa66dxb8JC2ywUFmBf6b2J+/ixWZTzfU=";
		};

		nativeBuildInputs = [ cmake pkg-config ];

		buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo ];
		buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo openssl ];

		# https://github.com/iurie-sw/geonkick/issues/120
		# Without this, the lv2 ends up in
		# /nix/store/$HASH/nix/store/$HASH/lib/lv2
		cmakeFlags = [
		"-DCMAKE_INSTALL_LIBDIR=lib"
		];

+21 −7

Original line number	Diff line number	Diff line
		{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline, python3 }:
		{
		stdenv,
		lib,
		fetchFromGitHub,
		libcap,
		acl,
		file,
		readline,
		python3,
		}:

		stdenv.mkDerivation rec {
		pname = "clifm";
		version = "1.17";
		version = "1.18";

		src = fetchFromGitHub {
		owner = "leo-arch";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-plJ2iKloRGtBSa1upSo675bMj6qczR6TQ043UQboxQE=";
		hash = "sha256-tgCGZCLCWcF7ktXqDHjoUkeVqxg6QVOkZb7pbk3nA+U=";
		};

		buildInputs = [ libcap acl file readline python3];
		buildInputs = [
		libcap
		acl
		file
		readline
		python3
		];

		makeFlags = [
		"DESTDIR=${placeholder "out"}"
		"DATADIR=/share"
		"PREFIX=/"
		"PREFIX=${placeholder "out"}"
		"DATADIR=${placeholder "out"}/share"
		];

		enableParallelBuilding = true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ let
		deprecatedNativeMessagingHost = option: pkg:
		if (cfg.${option} or false)
		then
		lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts.packages` instead"
		lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead"
		[pkg]
		else [];

+3 −2

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

		stdenv.mkDerivation rec {
		pname = "flink";
		version = "1.18.1";
		version = "1.19.0";

		src = fetchurl {
		url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
		sha256 = "sha256-EHyCdOimHIGlggjDnXmgk0+hBDfOjEvIafMMNSCeRak=";
		sha256 = "sha256-MRnG2zqPSBPe/OHInKxGER350MuXEqJk2gs6O3KQv4Y=";
		};

		nativeBuildInputs = [ makeWrapper ];
		@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
		homepage = "https://flink.apache.org";
		downloadPage = "https://flink.apache.org/downloads.html";
		license = licenses.asl20;
		sourceProvenance = with sourceTypes; [ binaryBytecode ];
		platforms = platforms.all;
		maintainers = with maintainers; [ mbode autophagy ];
		};

+2 −2

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

		stdenv.mkDerivation (finalAttrs: {
		pname = "atari800";
		version = "5.1.0";
		version = "5.2.0";

		src = fetchFromGitHub {
		owner = "atari800";
		repo = "atari800";
		rev = "ATARI800_${lib.replaceStrings ["."] ["_"] finalAttrs.version}";
		hash = "sha256-OZj0x9+M3jkiXUWgB93JTQzi4OUSBCZ3KtniwcZeVB0=";
		hash = "sha256-D66YRRTqdoV9TqDFonJ9XNpfP52AicuYgdiW27RCIuQ=";
		};

		nativeBuildInputs = [