Merge pull request #307483 from r-ryantm/auto-update/libgedit-gtksourceview (705bad7e) · Commits · mdf / nixpkgs

pkgs/applications/editors/gedit/default.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -9,9 +9,9 @@
		, gtk3
		, gtk-mac-integration
		, glib
		, tepl
		, libgedit-amtk
		, libgedit-gtksourceview
		, libgedit-tepl
		, libpeas
		, libxml2
		, gsettings-desktop-schemas
		@@ -30,13 +30,13 @@

		stdenv.mkDerivation rec {
		pname = "gedit";
		version = "46.2";
		version = "47.0";

		outputs = [ "out" "devdoc" ];

		src = fetchurl {
		url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
		sha256 = "wIZkErrRR+us4tKC/8u1oOmjBLIP1VZAvuIcgebVAe8=";
		sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o=";
		};

		patches = [
		@@ -65,13 +65,13 @@ stdenv.mkDerivation rec {
		];

		buildInputs = [
		tepl
		glib
		gsettings-desktop-schemas
		gspell
		gtk3
		libgedit-amtk
		libgedit-gtksourceview
		libgedit-tepl
		libpeas
		] ++ lib.optionals stdenv.isDarwin [
		gtk-mac-integration

pkgs/applications/editors/gnome-latex/default.nix

+12 −5

Original line number	Diff line number	Diff line
		{ stdenv
		, lib
		, fetchurl
		, fetchpatch
		, autoreconfHook
		, gtk-doc
		, vala
		@@ -8,10 +9,9 @@
		, wrapGAppsHook
		, gsettings-desktop-schemas
		, gspell
		, libgedit-amtk
		, libgedit-gtksourceview
		, libgedit-tepl
		, libgee
		, tepl
		, gnome
		, glib
		, pkg-config
		@@ -29,6 +29,14 @@ stdenv.mkDerivation rec {
		sha256 = "1nVVY5sqFaiuvVTzNTVORP40MxQ648s8ynqOJvgRKto=";
		};

		patches = [
		# Adapt for Tepl -> libgedit-tepl rename
		(fetchpatch {
		url = "https://gitlab.gnome.org/swilmet/gnome-latex/-/commit/41e532c427f43a5eed9081766963d6e29a9975a1.patch";
		hash = "sha256-gu8o/er4mP92dE5gWg9lGx5JwTHB8ytk3EMNlwlIpq4=";
		})
		];

		nativeBuildInputs = [
		pkg-config
		autoreconfHook
		@@ -45,11 +53,10 @@ stdenv.mkDerivation rec {
		glib
		gsettings-desktop-schemas
		gspell
		libgedit-amtk
		libgedit-gtksourceview
		libgedit-tepl
		libgee
		libxml2
		tepl
		];

		configureFlags = [
		@@ -66,7 +73,7 @@ stdenv.mkDerivation rec {
		};

		meta = with lib; {
		homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX";
		homepage = "https://gitlab.gnome.org/swilmet/gnome-latex";
		description = "A LaTeX editor for the GNOME desktop";
		maintainers = with maintainers; [ manveru bobby285271 ];
		license = licenses.gpl3Plus;

pkgs/by-name/li/libgedit-gfls/package.nix

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		{ stdenv
		, lib
		, fetchFromGitHub
		, docbook-xsl-nons
		, gobject-introspection
		, gtk-doc
		, meson
		, ninja
		, pkg-config
		, mesonEmulatorHook
		, gtk3
		, glib
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "libgedit-gfls";
		version = "0.1.0";

		outputs = [ "out" "dev" "devdoc" ];

		src = fetchFromGitHub {
		owner = "gedit-technology";
		repo = "libgedit-gfls";
		rev = finalAttrs.version;
		hash = "sha256-tES8UGWcCT8lRd/fnOt9EN3wHkNSLRM4j8ONrCDPBK0=";
		};

		nativeBuildInputs = [
		docbook-xsl-nons
		gobject-introspection
		gtk-doc
		meson
		ninja
		pkg-config
		] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
		mesonEmulatorHook
		];

		buildInputs = [
		gtk3
		];

		propagatedBuildInputs = [
		# Required by libgedit-gfls-1.pc
		glib
		];

		meta = {
		homepage = "https://github.com/gedit-technology/libgedit-gfls";
		description = "Module dedicated to file loading and saving";
		maintainers = with lib.maintainers; [ bobby285271 ];
		license = lib.licenses.lgpl3Plus;
		platforms = lib.platforms.linux;
		};
		})

pkgs/by-name/li/libgedit-gtksourceview/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "libgedit-gtksourceview";
		version = "299.0.5";
		version = "299.2.1";

		outputs = [ "out" "dev" "devdoc" ];

		@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
		owner = "gedit-technology";
		repo = "libgedit-gtksourceview";
		rev = finalAttrs.version;
		hash = "sha256-PQ7cpul9h1JzywDWm9YyD95B1ONSdUUk0EQJMEGoRN0=";
		hash = "sha256-fmYIZvsB3opstpPEd9vahcD9yUZKPBpSIrlNDs+eCdw=";
		};

		patches = [

pkgs/development/libraries/tepl/default.nix→pkgs/by-name/li/libgedit-tepl/package.nix

+13 −20

Original line number	Diff line number	Diff line
		{ stdenv
		, lib
		, fetchurl
		, fetchFromGitHub
		, meson
		, mesonEmulatorHook
		, ninja
		, gnome
		, gobject-introspection
		, gtk3
		, icu
		, libhandy
		, libgedit-amtk
		, libgedit-gfls
		, libgedit-gtksourceview
		, pkg-config
		, gtk-doc
		@@ -16,14 +17,16 @@
		}:

		stdenv.mkDerivation rec {
		pname = "tepl";
		version = "6.8.0";
		pname = "libgedit-tepl";
		version = "6.10.0";

		outputs = [ "out" "dev" "devdoc" ];

		src = fetchurl {
		url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
		sha256 = "Rubl8b/bxS5ZVvBq3VdenHaXxnPVPTgD3+do9JC1YPA=";
		src = fetchFromGitHub {
		owner = "gedit-technology";
		repo = "libgedit-tepl";
		rev = version;
		hash = "sha256-lGmOaDNu+iqwpeaP0AL28exoTqx1j03Z8gdhTBgk1i8=";
		};

		strictDeps = true;
		@@ -40,28 +43,18 @@ stdenv.mkDerivation rec {

		buildInputs = [
		icu
		libhandy
		];

		propagatedBuildInputs = [
		gtk3
		libgedit-amtk
		libgedit-gfls
		libgedit-gtksourceview
		];

		doCheck = false;
		# TODO: one test fails because of
		# (./test-file-metadata:20931): Tepl-WARNING **: 14:41:36.942: GVfs metadata
		# is not supported. Fallback to TeplMetadataManager. Either GVfs is not
		# correctly installed or GVfs metadata are not supported on this platform. In
		# the latter case, you should configure Tepl with --disable-gvfs-metadata.

		passthru.updateScript = gnome.updateScript {
		packageName = pname;
		versionPolicy = "odd-unstable";
		};

		meta = with lib; {
		homepage = "https://wiki.gnome.org/Projects/Tepl";
		homepage = "https://github.com/gedit-technology/libgedit-tepl";
		description = "Text editor product line";
		maintainers = with maintainers; [ manveru bobby285271 ];
		license = licenses.lgpl3Plus;

Admin message