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

doc/languages-frameworks/lua.section.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ Each interpreter has the following attributes:

		#### `buildLuarocksPackage` function {#buildluarockspackage-function}

		The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-lua-package.nix`
		The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-luarocks-package.nix`
		The following is an example:
		```nix
		luaposix = buildLuarocksPackage {

pkgs/applications/networking/browsers/vivaldi/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ let
		vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
		in stdenv.mkDerivation rec {
		pname = "vivaldi";
		version = "6.0.2979.22";
		version = "6.1.3035.111";

		suffix = {
		aarch64-linux = "arm64";
		@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
		src = fetchurl {
		url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
		hash = {
		aarch64-linux = "sha256-x7wBbd7BdurnWGFeHD5kYb5t0/zGEXQaUwbHnNA4iME=";
		x86_64-linux = "sha256-uN2nBWlullxpOZP2PzVCwKcNmO9XmDS3WiFOcp0dOqg=";
		aarch64-linux = "sha256-0bUe1Rn3pi08SaUxg+PXRXFD8V/TGVh40hkWSKvalhc=";
		x86_64-linux = "sha256-be+dKBxfDLitqstg3mZbwL4bYo4De7rIWp8+k99+a2o=";
		}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
		};

pkgs/applications/networking/instant-messengers/psi-plus/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;

		mkDerivation rec {
		pname = "psi-plus";
		version = "1.5.1646";
		version = "1.5.1650";

		src = fetchFromGitHub {
		owner = "psi-plus";
		repo = "psi-plus-snapshots";
		rev = version;
		sha256 = "sha256-FeZlJAJHmNGd7hbpjmthe2/yGxh0zIl3zXnA+vRjNCM=";
		sha256 = "sha256-qoqusg2CbivoPFbYnBSzE5P5+p1vCKmMbSBrPdC6SqI=";
		};

		cmakeFlags = [

pkgs/applications/networking/remote/citrix-workspace/generic.nix

+15 −7

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
		, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
		, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
		, libpulseaudio, pcsclite, glib-networking, llvmPackages_12
		, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4

		, homepage, version, prefix, hash

		@@ -82,12 +82,15 @@ stdenv.mkDerivation rec {
		libcxxabi
		libjpeg
		libpng12
		libpulseaudio
		libsoup
		libvorbis
		libxml2
		llvmPackages_12.libunwind
		mesa
		nspr
		nss
		opencv4
		openssl'
		pango
		speex
		@@ -98,9 +101,7 @@ stdenv.mkDerivation rec {
		xorg.libXScrnSaver
		xorg.libXtst
		zlib
		] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs
		++ lib.optional (lib.versionAtLeast version "20.10") libpulseaudio
		++ lib.optional (lib.versionAtLeast version "21.12") llvmPackages_12.libunwind;
		];

		runtimeDependencies = [
		glib
		@@ -121,7 +122,7 @@ stdenv.mkDerivation rec {
		installPhase = let
		icaFlag = program:
		if (builtins.match "selfservice(.*)" program) != null then "--icaroot"
		else if (lib.versionAtLeast version "21.12" && builtins.match "wfica(.*)" program != null) then null
		else if (builtins.match "wfica(.*)" program != null) then null
		else "-icaroot";
		wrap = program: ''
		wrapProgram $out/opt/citrix-icaclient/${program} \
		@@ -142,8 +143,7 @@ stdenv.mkDerivation rec {

		mkWrappers = lib.concatMapStringsSep "\n";

		toWrap = [ "wfica" "selfservice" "util/configmgr" "util/conncenter" "util/ctx_rehash" ]
		++ lib.optional (lib.versionOlder version "20.06") "selfservice_old";
		toWrap = [ "wfica" "selfservice" "util/configmgr" "util/conncenter" "util/ctx_rehash" ];
		in ''
		runHook preInstall

		@@ -198,6 +198,14 @@ stdenv.mkDerivation rec {
		# Make sure that `autoPatchelfHook` is executed before
		# running `ctx_rehash`.
		dontAutoPatchelf = true;
		preFixup = ''
		find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" \| while read -r fname; do
		# lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
		patchelf --replace-needed libtiff.so.5 libtiff.so $fname
		# lib needs libjpeg.so.8, but nixpkgs provides libjpeg.so.9
		patchelf --replace-needed libjpeg.so.8 libjpeg.so $fname
		done
		'';
		postFixup = ''
		autoPatchelf -- "$out"
		$out/opt/citrix-icaclient/util/ctx_rehash

pkgs/applications/networking/remote/citrix-workspace/sources.nix

+12 −0

Original line number	Diff line number	Diff line
		@@ -22,8 +22,20 @@ let
		x86hash = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b";
		x64suffix = "10";
		x86suffix = "10";
		homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest6.html";
		};

		"23.07.0" = {
		major = "23";
		minor = "7";
		patch = "0";
		x64hash = "d4001226e79b5353fc74da4c8ed4f6295c1859fe18142cb5de345a3c7ae48168";
		x86hash = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59";
		x64suffix = "17";
		x86suffix = "17";
		homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
		};

		};

		# Retain attribute-names for abandoned versions of Citrix workspace to

Admin message