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

pkgs/applications/audio/soundconverter/default.nix

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		{ lib, fetchurl
		# Optional due to unfree license.
		, faacSupport ? false
		, glib, python3Packages, gtk3, wrapGAppsHook
		, gsettings-desktop-schemas, intltool, xvfb-run
		, gobject-introspection, gst_all_1, fdk-aac-encoder }:

		python3Packages.buildPythonApplication rec {
		pname = "soundconverter";
		version = "4.0.3";

		src = fetchurl {
		url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz";
		sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0=";
		};

		buildInputs = [
		gtk3
		fdk-aac-encoder
		gobject-introspection
		gst_all_1.gst-libav
		gst_all_1.gst-plugins-base
		gst_all_1.gst-plugins-good
		gst_all_1.gst-plugins-ugly
		(gst_all_1.gst-plugins-bad.override { inherit faacSupport; })
		];

		nativeBuildInputs = [
		intltool
		wrapGAppsHook
		];

		propagatedBuildInputs = [
		python3Packages.gst-python
		python3Packages.distutils_extra
		python3Packages.setuptools
		python3Packages.pygobject3
		];

		checkInputs = [
		xvfb-run
		];

		postPatch = ''
		substituteInPlace bin/soundconverter --replace \
		"DATA_PATH = os.path.join(SOURCE_PATH, 'data')" \
		"DATA_PATH = '$out/share/soundconverter'"
		'';

		preCheck = let
		self = { outPath = "$out"; name = "${pname}-${version}"; };
		xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath;
		in ''
		export HOME=$TMPDIR
		export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]}
		# FIXME: Fails due to weird Gio.file_parse_name() behavior.
		sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py
		'' + lib.optionalString (!faacSupport) ''
		substituteInPlace tests/testcases/integration.py --replace \
		"for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \
		"for encoder in ['fdkaacenc', 'avenc_aac']:"
		'';

		checkPhase = ''
		runHook preCheck
		xvfb-run python tests/test.py
		runHook postCheck
		'';

		# Necessary to set GDK_PIXBUF_MODULE_FILE.
		strictDeps = false;

		meta = with lib; {
		homepage = "https://soundconverter.org/";
		description = "Leading audio file converter for the GNOME Desktop";
		longDescription = ''
		SoundConverter reads anything the GStreamer library can read,
		and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files.
		Uses Python and GTK+ GUI toolkit, and runs on X Window System.
		'';
		license = licenses.gpl3Only;
		platforms = platforms.linux;
		maintainers = with maintainers; [ jakubgs ];
		};
		}

pkgs/applications/editors/vscode/vscode.nix

+6 −6

Original line number	Diff line number	Diff line
		@@ -14,17 +14,17 @@ let
		archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

		sha256 = {
		x86_64-linux = "04lyih67vcf2hficvlv1r25k8k48n9x15sbqrfp1syzhy5i4zch3";
		x86_64-darwin = "0460mh1ah9hswn8ihais5hzvz453r36ay2bb3hy3z1grfs3s5blk";
		aarch64-linux = "1db2r4ja0srya2lw900l4mk24xva00kf7vxajcb7q0rab4cpfr3n";
		aarch64-darwin = "04c43ibbarsqdm1wcsmsi9rnfsl3lyq638d3j0dj94xifk0v61j9";
		armv7l-linux = "1qzi2biy5mjbxdgcakzmid68ykq6vrgj4lqmz0jk3g46r4kpnrgd";
		x86_64-linux = "09hqcym8dj4d8r5ibdzypdmjxdw4ix24zq688vnb4kfas2jbb3hi";
		x86_64-darwin = "1wij82gl1wqrprrfn9cfih19wr4h3bn2xapr1l2l0mkansrzsvg5";
		aarch64-linux = "09x93i190lmxb3ygzjcmb7ag3dz7ixf07yk7zqc7ljrnn5f0b6ag";
		aarch64-darwin = "1k7glnqy0vjx55chjpwbgwipcvzb0vx0wmvqis865pvzmr0d06a0";
		armv7l-linux = "0vkivg1f61k8vkr0j9dm7fw2klh45xxnp07pill1gmrwxafm5bra";
		}.${system};
		in
		callPackage ./generic.nix rec {
		# Please backport all compatible updates to the stable release.
		# This is important for the extension ecosystem.
		version = "1.65.0";
		version = "1.65.1";
		pname = "vscode";

		executableName = "code" + lib.optionalString isInsiders "-insiders";

pkgs/applications/editors/vscode/vscodium.nix

+5 −5

Original line number	Diff line number	Diff line
		@@ -13,10 +13,10 @@ let
		archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

		sha256 = {
		x86_64-linux = "0a38bjkksna7q2lhcm1hgfn189jw3k8svw0jf591bpq7jvknim1v";
		x86_64-darwin = "173rhavczm0k9qgrlz68rdvwsmy3ynq2g14shx9gipchr1i0rih5";
		aarch64-linux = "00xkhwvxmyiyy9k1vh23sqyib584qafzs1m57xraqq3n8098jrng";
		armv7l-linux = "0lqq54hnv4b1m47cya7196cn00jwslcsh5ykicgq0dxljrcawi0y";
		x86_64-linux = "09zpc8c2il6x88h65kbm6z8vfnx0byzpcqqy9a1za5ilqr3dhk43";
		x86_64-darwin = "09m2ij0phf5ni5m110z2bnmd9z50lz1qsh7w7cfawycjhwsl602z";
		aarch64-linux = "1nsdn9mc4ahrz392w2z071sfxc5jmwhamlaid2qy899cc7sk8nqr";
		armv7l-linux = "1ii6li6l09ccxf0gyjy3f5752kr4a8pga5w0a0ndgfa73mhlamin";
		}.${system};

		sourceRoot = {
		@@ -31,7 +31,7 @@ in

		# Please backport all compatible updates to the stable release.
		# This is important for the extension ecosystem.
		version = "1.65.0";
		version = "1.65.1";
		pname = "vscodium";

		executableName = "codium";

pkgs/applications/networking/cluster/cni/plugins.nix

+2 −2

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

		buildGoModule rec {
		pname = "cni-plugins";
		version = "1.1.0";
		version = "1.1.1";

		src = fetchFromGitHub {
		owner = "containernetworking";
		repo = "plugins";
		rev = "v${version}";
		sha256 = "sha256-M0bYMaOqHkG1J6xGEqVvmYda/B6qDIrFOQhhW2LXiYE=";
		sha256 = "sha256-I9OmTO5obTwAj4hkecUfmRYR4Q3rdllMfbpESv66eEQ=";
		};

		vendorSha256 = null;

pkgs/applications/networking/cluster/kn/default.nix

+2 −2

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

		buildGoModule rec {
		pname = "kn";
		version = "1.2.0";
		version = "1.3.0";

		src = fetchFromGitHub {
		owner = "knative";
		repo = "client";
		rev = "knative-v${version}";
		sha256 = "sha256-yWzrMkkusRueHyWT4LwrflH4N7BNri2ycHIuAyvXceo=";
		sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY=";
		};

		vendorSha256 = null;

Admin message