Merge pull request #270599 from blitz/fractal-5-backport (b5433ba9) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/fractal-next/Cargo.lock

deleted100644 → 0

+0 −5773

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/instant-messengers/fractal-next/default.nix

deleted100644 → 0

+0 −86

Original line number	Diff line number	Diff line
		{ stdenv
		, lib
		, fetchFromGitLab
		, cargo
		, meson
		, ninja
		, rustPlatform
		, rustc
		, pkg-config
		, glib
		, gtk4
		, gtksourceview5
		, libadwaita
		, gstreamer
		, gst-plugins-base
		, gst-plugins-bad
		, desktop-file-utils
		, appstream-glib
		, openssl
		, pipewire
		, libshumate
		, wrapGAppsHook4
		, sqlite
		, xdg-desktop-portal
		}:

		stdenv.mkDerivation rec {
		pname = "fractal-next";
		version = "5.beta2";

		src = fetchFromGitLab {
		domain = "gitlab.gnome.org";
		owner = "GNOME";
		repo = "fractal";
		rev = version;
		hash = "sha256-/BO+TlhLhi7BGsHq8aOpYw8AqNrJT0IJZOc1diq2Rys=";
		};

		cargoDeps = rustPlatform.importCargoLock {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"matrix-sdk-0.6.2" = "sha256-A1oKNbEx2A6WwvYcNSW53Fd6QWwr0QFJtrsJXO2KInE=";
		"ruma-0.8.2" = "sha256-kCGS7ACFGgmtTUElLJQMYfjwJ3glF7bRPZYJIFcuPtc=";
		"curve25519-dalek-4.0.0" = "sha256-sxEFR6lsX7t4u/fhWd6wFMYETI2egPUbjMeBWkB289E=";
		"vodozemac-0.4.0" = "sha256-TCbWJ9bj/FV3ILWUTcksazel8ESTNTiDGL7kGlEGvow=";
		};
		};

		nativeBuildInputs = [
		glib
		gtk4
		meson
		ninja
		pkg-config
		rustPlatform.bindgenHook
		rustPlatform.cargoSetupHook
		cargo
		rustc
		desktop-file-utils
		appstream-glib
		wrapGAppsHook4
		];

		buildInputs = [
		glib
		gstreamer
		gst-plugins-base
		gst-plugins-bad
		gtk4
		gtksourceview5
		libadwaita
		openssl
		pipewire
		libshumate
		sqlite
		xdg-desktop-portal
		];

		meta = with lib; {
		description = "Matrix group messaging app (development version)";
		homepage = "https://gitlab.gnome.org/GNOME/fractal";
		license = licenses.gpl3Plus;
		maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]);
		mainProgram = "fractal";
		};
		}

pkgs/applications/networking/instant-messengers/fractal/Cargo.lock

+5213 −1811

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/instant-messengers/fractal/default.nix

+36 −49

Original line number	Diff line number	Diff line
		@@ -5,88 +5,75 @@
		, cargo
		, meson
		, ninja
		, gettext
		, python3
		, rustPlatform
		, rustc
		, pkg-config
		, gtksourceview4
		, glib
		, libhandy_0
		, gtk3
		, dbus
		, gtk4
		, gtksourceview5
		, libadwaita
		, gst_all_1
		, desktop-file-utils
		, appstream-glib
		, openssl
		, pipewire
		, libshumate
		, wrapGAppsHook4
		, sqlite
		, gst_all_1
		, cairo
		, gdk-pixbuf
		, gspell
		, wrapGAppsHook
		, xdg-desktop-portal
		}:

		stdenv.mkDerivation rec {
		pname = "fractal";
		version = "4.4.2";
		version = "5";

		src = fetchFromGitLab {
		domain = "gitlab.gnome.org";
		owner = "GNOME";
		repo = "fractal";
		rev = version;
		hash = "sha256-/vPadtyiYDX0PdneMxc0oSWb5OYnikevqajl3WgZiGA=";
		hash = "sha256-XHb8HjQ5PDL2sen6qUivDllvYEhKnp1vQynD2Lksi30=";
		};

		cargoDeps = rustPlatform.importCargoLock {
		lockFile = ./Cargo.lock;
		outputHashes = {
		"either-1.5.99" = "sha256-Lmv9OPZKEb7tmkN+7Mua2nx0xmZwm3d1W623UKUlPeg=";
		"gettext-rs-0.4.2" = "sha256-wyZ1bf0oFcQo8gEi2GEalRUoKMoJYHysu79qcfjd4Ng=";
		"sourceview4-0.2.0" = "sha256-RuCg05/qjkPri1QUd5acsGVqJtGvM5OO8/R+Nibxoa4=";
		"matrix-sdk-0.6.2" = "sha256-X+4077rlaE8zjXHXPUfiYwa/+Bg0KTFrcsAg7yCz4ug=";
		"mas-http-0.5.0-rc.2" = "sha256-XH+I5URcbkSY4NDwfOFhIjb+/swuGz6n9hKufziPgoY=";
		};
		};

		nativeBuildInputs = [
		gettext
		glib
		gtk4
		meson
		ninja
		pkg-config
		python3
		cargo
		rustPlatform.bindgenHook
		rustPlatform.cargoSetupHook
		cargo
		rustc
		wrapGAppsHook
		glib
		desktop-file-utils
		appstream-glib
		wrapGAppsHook4
		];

		buildInputs = [
		cairo
		dbus
		gdk-pixbuf
		glib
		gspell
		gst_all_1.gst-editing-services
		gst_all_1.gst-plugins-bad
		gst_all_1.gst-plugins-base
		(gst_all_1.gst-plugins-good.override {
		gtkSupport = true;
		})
		gst_all_1.gstreamer
		gst_all_1.gst-devtools
		gtk3
		gtksourceview4
		libhandy_0
		gtk4
		gtksourceview5
		libadwaita
		openssl
		pipewire
		libshumate
		sqlite
		];

		postPatch = ''
		chmod +x scripts/test.sh
		patchShebangs scripts/meson_post_install.py scripts/test.sh
		'';

		preConfigure = ''
		export GETTEXT_DIR="${gettext}"
		'';
		xdg-desktop-portal
		] ++ (with gst_all_1; [
		gstreamer
		gst-plugins-base
		gst-plugins-bad
		gst-plugins-good
		]);

		passthru = {
		updateScript = nix-update-script { };
		@@ -95,8 +82,8 @@ stdenv.mkDerivation rec {
		meta = with lib; {
		description = "Matrix group messaging app";
		homepage = "https://gitlab.gnome.org/GNOME/fractal";
		license = licenses.gpl3;
		maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]);
		platforms = platforms.unix;
		license = licenses.gpl3Plus;
		maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]);
		mainProgram = "fractal";
		};
		}

pkgs/top-level/aliases.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,7 @@ mapAliases ({
		foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
		foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
		foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20
		fractal-next = fractal; # added 2023-11-25
		fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
		fx_cast_bridge = fx-cast-bridge; # added 2023-07-26