Merge master into staging-next (51bf815a) · Commits · mdf / nixpkgs

maintainers/maintainer-list.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -3745,6 +3745,16 @@
		githubId = 1176131;
		name = "George Whewell";
		};
		georgyo = {
		email = "george@shamm.as";
		github = "georgyo";
		githubId = 19374;
		name = "George Shammas";
		keys = [{
		longkeyid = "rsa4096/0x82BB70D541AE2DB4";
		fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
		}];
		};
		gerschtli = {
		email = "tobias.happ@gmx.de";
		github = "Gerschtli";

pkgs/applications/audio/hqplayer-desktop/default.nix

+10 −7

Original line number	Diff line number	Diff line
		@@ -17,11 +17,13 @@

		mkDerivation rec {
		pname = "hqplayer-desktop";
		version = "4.12.0-34";
		version = "4.12.1-35";

		src = fetchurl {
		# FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs
		# c.f. https://github.com/NixOS/nixpkgs/pull/111616
		url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm";
		sha256 = "sha256-9kLKmi5lNtnRm9b4HnO01cO/C+Sg0DcKD64N5WBbYOE=";
		sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8=";
		};

		unpackPhase = ''
		@@ -47,6 +49,8 @@ mkDerivation rec {
		dontBuild = true;

		installPhase = ''
		runHook preInstall

		# main executable
		mkdir -p $out/bin
		cp ./usr/bin/* $out/bin
		@@ -62,16 +66,16 @@ mkDerivation rec {
		# pixmaps
		mkdir -p $out/share/pixmaps
		cp ./usr/share/pixmaps/* $out/share/pixmaps

		runHook postInstall
		'';

		postInstall = ''
		for desktopFile in $out/share/applications/*; do
		substituteInPlace "$desktopFile" \
		--replace '/usr/bin/' '$out/bin/' \
		--replace '/usr/share/doc/' '$out/share/doc/'
		--replace /usr/bin/ $out/bin/ \
		--replace /usr/share/doc/ $out/share/doc/
		done

		gunzip $out/share/doc/${pname}/*.gz
		'';

		postFixup = ''
		@@ -81,7 +85,6 @@ mkDerivation rec {
		meta = with lib; {
		homepage = "https://www.signalyst.com/custom.html";
		description = "High-end upsampling multichannel software HD-audio player";
		changelog = "https://www.signalyst.eu/bins/${pname}/fc33/hqplayer4desktop-${version}fc33.x86_64.changes";
		license = licenses.unfree;
		maintainers = with maintainers; [ lovesegfault ];
		};

pkgs/applications/editors/jetbrains/common.nix

+10 −8

Original line number	Diff line number	Diff line
		@@ -3,13 +3,13 @@
		, vmopts ? null
		}:

		{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }:
		{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args:

		with lib;

		let loName = toLower product;
		hiName = toUpper product;
		execName = concatStringsSep "-" (init (splitString "-" name));
		mainProgram = concatStringsSep "-" (init (splitString "-" name));
		vmoptsName = loName
		+ ( if (with stdenv.hostPlatform; (is32bit \|\| isDarwin))
		then ""
		@@ -18,15 +18,17 @@ let loName = toLower product;
		in

		with stdenv; lib.makeOverridable mkDerivation rec {
		inherit name src meta;
		inherit name src;
		meta = args.meta // { inherit mainProgram; };

		desktopItem = makeDesktopItem {
		name = execName;
		exec = execName;
		name = mainProgram;
		exec = mainProgram;
		comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
		desktopName = product;
		genericName = meta.description;
		categories = "Development;";
		icon = execName;
		icon = mainProgram;
		extraEntries = ''
		StartupWMClass=${wmClass}
		'';
		@@ -64,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec {
		installPhase = ''
		mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
		cp -a . $out/$name
		ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
		ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
		mv bin/fsnotifier* $out/libexec/${name}/.

		jdk=${jdk.home}
		item=${desktopItem}

		makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
		makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \
		--prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
		--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
		# Some internals want libstdc++.so.6

pkgs/applications/misc/electrum/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		}:

		let
		version = "4.1.2";
		version = "4.1.3";

		libsecp256k1_name =
		if stdenv.isLinux then "libsecp256k1.so.0"
		@@ -36,7 +36,7 @@ let
		owner = "spesmilo";
		repo = "electrum";
		rev = version;
		sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5";
		sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781";

		extraPostFetch = ''
		mv $out ./all
		@@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication {

		src = fetchurl {
		url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
		sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk";
		sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf";
		};

		postUnpack = ''

pkgs/applications/misc/gallery-dl/default.nix

+2 −2

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

		buildPythonApplication rec {
		pname = "gallery_dl";
		version = "1.17.4";
		version = "1.17.5";

		src = fetchPypi {
		inherit pname version;
		sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293";
		sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9";
		};

		propagatedBuildInputs = [ requests ];

Admin message