dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #307483 from r-ryantm/auto-update/libgedit-gtksourceview

Browse Source 
gedit 47.0, libgedit-gtksourceview 299.2.1, libgedit-tepl 6.10.0
This commit is contained in:
Bobby Rong 2024-04-30 19:53:41 +08:00 committed by GitHub
commit 705bad7ed6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 87 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/gedit/default.nix
View File

@ -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

17
pkgs/applications/editors/gnome-latex/default.nix
View File

@ -1,6 +1,7 @@
{ 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;

55
pkgs/by-name/li/libgedit-gfls/package.nix Normal file
View File

@ -0,0 +1,55 @@
{ 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;
};
})

4
pkgs/by-name/li/libgedit-gtksourceview/package.nix
View File

@ -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 = [

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

@ -1,14 +1,15 @@
{ 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;

1
pkgs/top-level/aliases.nix
View File

@ -1229,6 +1229,7 @@ mapAliases ({
teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04
teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14
tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08
tepl = libgedit-tepl; # Added 2024-04-29
testVersion = testers.testVersion; # Added 2022-04-20
tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17

2
pkgs/top-level/all-packages.nix
View File

@ -24721,8 +24721,6 @@ with pkgs;
harfbuzz = harfbuzzFull;
};
tepl = callPackage ../development/libraries/tepl { };
termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_8; };
telepathy-glib = callPackage ../development/libraries/telepathy/glib { };