Unverified Commit 70912233 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

gedit, libgedit-*: Updates (#403275)

Closes #388337
parents 0c80f984 e722f9f8
Loading
Loading
Loading
Loading
+13 −11
Original line number Diff line number Diff line
{
  stdenv,
  lib,
  fetchurl,
  fetchFromGitLab,
  desktop-file-utils,
  docbook-xsl-nons,
  gettext,
@@ -21,16 +21,20 @@
  libgedit-gtksourceview,
  libgedit-tepl,
  libgee,
  gnome,
  gitUpdater,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "enter-tex";
  version = "3.47.0";
  version = "3.48.0";

  src = fetchurl {
    url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz";
    hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o=";
  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    group = "World";
    owner = "gedit";
    repo = "enter-tex";
    tag = finalAttrs.version;
    hash = "sha256-OnkP4E1kNWuE9k7SQ/ujnxnFgVyAqIhqHAw04ZA0Tno=";
  };

  nativeBuildInputs = [
@@ -60,18 +64,16 @@ stdenv.mkDerivation (finalAttrs: {

  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
    # https://gitlab.gnome.org/World/gedit/enter-tex/-/blob/3.48.0/docs/more-information.md#install-procedure
    ninja src/gtex/Gtex-1.gir
  '';

  doCheck = true;

  passthru.updateScript = gnome.updateScript {
    packageName = "enter-tex";
  };
  passthru.updateScript = gitUpdater { };

  meta = with lib; {
    homepage = "https://gitlab.gnome.org/swilmet/enter-tex";
    homepage = "https://gitlab.gnome.org/World/gedit/enter-tex";
    description = "LaTeX editor for the GNOME desktop";
    maintainers = with maintainers; [
      manveru
+12 −18
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@
  lib,
  meson,
  mesonEmulatorHook,
  fetchurl,
  python3,
  fetchFromGitLab,
  pkg-config,
  gtk3,
  gtk-mac-integration,
@@ -20,7 +19,7 @@
  gobject-introspection,
  docbook-xsl-nons,
  ninja,
  gnome,
  gitUpdater,
  gspell,
  itstool,
  desktop-file-utils,
@@ -29,16 +28,21 @@

stdenv.mkDerivation rec {
  pname = "gedit";
  version = "48.1";
  version = "48.2";

  outputs = [
    "out"
    "devdoc"
  ];

  src = fetchurl {
    url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
    hash = "sha256-lx56wmvAo6Pe0np1Y3ckFWh9sOWgkrRUflsQpVhYswo=";
  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    group = "World";
    owner = "gedit";
    repo = "gedit";
    tag = version;
    fetchSubmodules = true;
    hash = "sha256-M8ZyjY4wSogEjhEx9sOKfuGkbiypDmZoU0H4ja+TgaY=";
  };

  patches = [
@@ -55,7 +59,6 @@ stdenv.mkDerivation rec {
      meson
      ninja
      pkg-config
      python3
      vala
      wrapGAppsHook3
      gtk-doc
@@ -81,19 +84,10 @@ stdenv.mkDerivation rec {
      gtk-mac-integration
    ];

  postPatch = ''
    chmod +x build-aux/meson/post_install.py
    patchShebangs build-aux/meson/post_install.py
  '';

  # Reliably fails to generate gedit-file-browser-enum-types.h in time
  enableParallelBuilding = false;

  passthru = {
    updateScript = gnome.updateScript {
      packageName = "gedit";
    };
  };
  passthru.updateScript = gitUpdater { };

  meta = with lib; {
    homepage = "https://gitlab.gnome.org/World/gedit/gedit";
+6 −3
Original line number Diff line number Diff line
@@ -11,11 +11,12 @@
  mesonEmulatorHook,
  gtk3,
  glib,
  gitUpdater,
}:

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

  outputs = [
    "out"
@@ -28,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
    group = "World";
    owner = "gedit";
    repo = "libgedit-gfls";
    rev = finalAttrs.version;
    hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg=";
    tag = finalAttrs.version;
    hash = "sha256-X56QPcmNB0Ey+kzSqDnb6/j6/w7IU7MFSAxW8mX8I3w=";
  };

  nativeBuildInputs =
@@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
    glib
  ];

  passthru.updateScript = gitUpdater { };

  meta = {
    homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls";
    description = "Module dedicated to file loading and saving";
+6 −3
Original line number Diff line number Diff line
@@ -15,11 +15,12 @@
  pkg-config,
  gtk-doc,
  docbook-xsl-nons,
  gitUpdater,
}:

stdenv.mkDerivation rec {
  pname = "libgedit-tepl";
  version = "6.12.0";
  version = "6.13.0";

  outputs = [
    "out"
@@ -32,8 +33,8 @@ stdenv.mkDerivation rec {
    group = "World";
    owner = "gedit";
    repo = "libgedit-tepl";
    rev = version;
    hash = "sha256-s3b7wj6b2SM0+i0vXUDDhnspgPcsRAsA5kLblh0orJE=";
    tag = version;
    hash = "sha256-YWONsw5+gq5Uew6xB76pKsGTJmI83zAssO5WX6aP7ZM=";
  };

  strictDeps = true;
@@ -62,6 +63,8 @@ stdenv.mkDerivation rec {
    libgedit-gtksourceview
  ];

  passthru.updateScript = gitUpdater { };

  meta = with lib; {
    homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl";
    description = "Text editor product line";