gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgedit-amtk, libgedit-gfls, libgedit-gtksourceview, libgedit-tepl, gedit, enter-tex: Update (#342828)

Browse Source
This commit is contained in:
Bobby Rong
2024-09-19 22:02:52 +08:00
committed by GitHub
parent f6676eac25 9052a2df9d
commit 04b776d6cd
10 changed files with 134 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/gedit/correct-gir-lib-path.patch
+12 -9
View File
@@ -1,13 +1,16 @@
diff --git a/gedit/meson.build b/gedit/meson.build
index a8683e61a..fc48669f7 100644
index bc689e5..e3b90d8 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -191,7 +191,7 @@ libgedit_shared_lib = shared_library(
c_args: libgedit_c_args,
link_args: libgedit_link_args,
install: true,
- install_dir: get_option('libdir') / 'gedit',
+ install_dir: get_option('prefix') / get_option('libdir') / 'gedit',
)
@@ -165,9 +165,9 @@ libgedit_private_headers += 'gedit-enum-types-private.h'
subdir('resources')
# GObject Introspection
if host_machine.system() == 'windows'
- libgedit_shared_lib_install_dir = get_option('libdir')
+ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir')
else
- libgedit_shared_lib_install_dir = get_option('libdir') / 'gedit'
+ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') / 'gedit'
endif
libgedit_shared_lib = shared_library(
pkgs/applications/editors/gedit/default.nix
+3 -15
View File
@@ -4,7 +4,6 @@
, mesonEmulatorHook
, fetchurl
, python3
, python3Packages
, pkg-config
, gtk3
, gtk-mac-integration
@@ -30,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "gedit";
version = "47.0";
version = "48.0";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o=";
sha256 = "/g/vm3sHmRINuGrok6BgA2oTRFNS3tkWm6so04rPDoA=";
};
patches = [
@@ -54,7 +53,6 @@ stdenv.mkDerivation rec {
perl
pkg-config
python3
python3Packages.wrapPython
vala
wrapGAppsHook3
gtk-doc
@@ -87,16 +85,6 @@ stdenv.mkDerivation rec {
# Reliably fails to generate gedit-file-browser-enum-types.h in time
enableParallelBuilding = false;
pythonPath = with python3Packages; [
# https://github.com/NixOS/nixpkgs/issues/298716
pycairo
];
postFixup = ''
buildPythonPath "$pythonPath"
patchPythonScript $out/lib/gedit/plugins/snippets/document.py
'';
passthru = {
updateScript = gnome.updateScript {
packageName = "gedit";
@@ -104,7 +92,7 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
homepage = "https://gedit-technology.github.io/apps/gedit/";
homepage = "https://gitlab.gnome.org/World/gedit/gedit";
description = "Former GNOME text editor";
maintainers = with maintainers; [ bobby285271 ];
license = licenses.gpl2Plus;
pkgs/applications/editors/gnome-latex/default.nix
-84
View File
@@ -1,84 +0,0 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, autoreconfHook
, gtk-doc
, vala
, gobject-introspection
, wrapGAppsHook3
, gsettings-desktop-schemas
, gspell
, libgedit-gtksourceview
, libgedit-tepl
, libgee
, adwaita-icon-theme
, gnome
, glib
, pkg-config
, gettext
, itstool
, libxml2
}:
stdenv.mkDerivation rec {
version = "3.46.0";
pname = "gnome-latex";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
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
gtk-doc
vala
gobject-introspection
wrapGAppsHook3
itstool
gettext
];
buildInputs = [
adwaita-icon-theme
glib
gsettings-desktop-schemas
gspell
libgedit-gtksourceview
libgedit-tepl
libgee
libxml2
];
configureFlags = [
"--disable-dconf-migration"
];
doCheck = true;
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
passthru.updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/swilmet/gnome-latex";
description = "LaTeX editor for the GNOME desktop";
maintainers = with maintainers; [ manveru bobby285271 ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "gnome-latex";
};
}
pkgs/by-name/en/enter-tex/package.nix
+84
View File
@@ -0,0 +1,84 @@
{
stdenv,
lib,
fetchurl,
desktop-file-utils,
docbook-xsl-nons,
gettext,
gobject-introspection,
gtk-doc,
itstool,
meson,
ninja,
pkg-config,
vala,
wrapGAppsHook3,
dconf,
glib,
gsettings-desktop-schemas,
gspell,
libgedit-amtk,
libgedit-gtksourceview,
libgedit-tepl,
libgee,
gnome,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "enter-tex";
version = "3.47.0";
src = fetchurl {
url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz";
hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o=";
};
nativeBuildInputs = [
desktop-file-utils
docbook-xsl-nons
gettext
gobject-introspection
gtk-doc
itstool
meson
ninja
pkg-config
vala
wrapGAppsHook3
];
buildInputs = [
dconf
glib
gsettings-desktop-schemas
gspell
libgedit-amtk
libgedit-gtksourceview
libgedit-tepl
libgee
];
preBuild = ''
# Workaround the use case of C code mixed with Vala code.
# https://gitlab.gnome.org/swilmet/enter-tex/-/blob/3.47.0/docs/more-information.md#install-procedure
ninja src/gtex/Gtex-1.gir
'';
doCheck = true;
passthru.updateScript = gnome.updateScript {
packageName = "enter-tex";
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/swilmet/enter-tex";
description = "LaTeX editor for the GNOME desktop";
maintainers = with maintainers; [
manveru
bobby285271
];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "enter-tex";
};
})
pkgs/by-name/li/libgedit-amtk/package.nix
+9 -9
View File
@@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchFromGitLab
, glib
, gtk3
, meson
@@ -17,15 +17,17 @@
stdenv.mkDerivation rec {
pname = "libgedit-amtk";
version = "5.8.0";
version = "5.9.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitHub {
owner = "gedit-technology";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "gedit";
repo = "libgedit-amtk";
rev = version;
hash = "sha256-U77/KMZw9k9ukebCXVXAsCa4uJaTgw9irfZ/l0303kk=";
hash = "sha256-D6jZmadUHDtxedw/tCsKHzcWXobs6Vb7dyhbVKqu2Zc=";
};
strictDeps = true;
@@ -62,12 +64,10 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
passthru.updateScript = gitUpdater {
odd-unstable = true;
};
passthru.updateScript = gitUpdater { };
meta = with lib; {
homepage = "https://github.com/gedit-technology/libgedit-amtk";
homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk";
description = "Actions, Menus and Toolbars Kit for GTK applications";
maintainers = with maintainers; [ manveru bobby285271 ];
license = licenses.lgpl21Plus;
pkgs/by-name/li/libgedit-gfls/package.nix
+8 -6
View File
@@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchFromGitLab
, docbook-xsl-nons
, gobject-introspection
, gtk-doc
@@ -14,15 +14,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libgedit-gfls";
version = "0.1.0";
version = "0.2.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitHub {
owner = "gedit-technology";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "gedit";
repo = "libgedit-gfls";
rev = finalAttrs.version;
hash = "sha256-tES8UGWcCT8lRd/fnOt9EN3wHkNSLRM4j8ONrCDPBK0=";
hash = "sha256-oxsqggn4O4SwGEas840qE103hKU4f+GP+ItOtD3M+ac=";
};
nativeBuildInputs = [
@@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
homepage = "https://github.com/gedit-technology/libgedit-gfls";
homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls";
description = "Module dedicated to file loading and saving";
maintainers = with lib.maintainers; [ bobby285271 ];
license = lib.licenses.lgpl3Plus;
pkgs/by-name/li/libgedit-gtksourceview/package.nix
+9 -9
View File
@@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchFromGitLab
, docbook-xsl-nons
, gobject-introspection
, gtk-doc
@@ -16,15 +16,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libgedit-gtksourceview";
version = "299.2.1";
version = "299.3.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitHub {
owner = "gedit-technology";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "gedit";
repo = "libgedit-gtksourceview";
rev = finalAttrs.version;
hash = "sha256-fmYIZvsB3opstpPEd9vahcD9yUZKPBpSIrlNDs+eCdw=";
hash = "sha256-C2Bq01PlALJMr7kHsSr9VaSNcktc250yGevRYQ7Ipck=";
};
patches = [
@@ -55,13 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
shared-mime-info
];
passthru.updateScript = gitUpdater {
odd-unstable = true;
};
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Source code editing widget for GTK";
homepage = "https://github.com/gedit-technology/libgedit-gtksourceview";
homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ bobby285271 ];
platforms = platforms.linux;
pkgs/by-name/li/libgedit-tepl/package.nix
+8 -6
View File
@@ -1,6 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchFromGitLab
, meson
, mesonEmulatorHook
, ninja
@@ -18,15 +18,17 @@
stdenv.mkDerivation rec {
pname = "libgedit-tepl";
version = "6.10.0";
version = "6.11.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitHub {
owner = "gedit-technology";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "gedit";
repo = "libgedit-tepl";
rev = version;
hash = "sha256-lGmOaDNu+iqwpeaP0AL28exoTqx1j03Z8gdhTBgk1i8=";
hash = "sha256-8y3EQZKYRcx2ocG7aR7tGBCE/68yPdrBcPNm6O2lM4c=";
};
strictDeps = true;
@@ -54,7 +56,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "https://github.com/gedit-technology/libgedit-tepl";
homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl";
description = "Text editor product line";
maintainers = with maintainers; [ manveru bobby285271 ];
license = licenses.lgpl3Plus;
pkgs/top-level/aliases.nix
+1
View File
@@ -532,6 +532,7 @@ mapAliases ({
gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18
gnu-cobol = gnucobol; # Added 2024-09-17
go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04
gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06
pkgs/top-level/all-packages.nix
-2
View File
@@ -17868,8 +17868,6 @@ with pkgs;
gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { };
gnome-latex = callPackage ../applications/editors/gnome-latex { };
gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { };
gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer { };