sequeler: 0.8.2 -> 0.9.0 (#478754)

pkgs/by-name/se/sequeler/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  nix-update-script,
+  gitUpdater,
   vala,
   meson,
   ninja,
@@ -10,13 +10,12 @@
   pantheon,
   gettext,
   wrapGAppsHook3,
-  python3,
   desktop-file-utils,
   gtk3,
   glib,
   libgee,
   libgda5,
-  gtksourceview,
+  gtksourceview4,
   libxml2,
   libsecret,
   libssh2,
@@ -31,13 +30,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "sequeler";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
-    owner = "Alecaddd";
+    owner = "ellie-commons";
     repo = "sequeler";
-    rev = "v${version}";
-    sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4=";
+    tag = "v${version}";
+    hash = "sha256-dFmR5SfzT/1UVwcnB3Y3kB1h0DapwN/2/KQAHiMpk/8=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +46,6 @@ stdenv.mkDerivation rec {
     vala
     gettext
     wrapGAppsHook3
-    python3
     desktop-file-utils
   ];
 
@@ -57,19 +55,18 @@ stdenv.mkDerivation rec {
     pantheon.granite
     libgee
     sqlGda
-    gtksourceview
+    gtksourceview4
     libxml2
     libsecret
     libssh2
   ];
 
-  postPatch = ''
-    chmod +x build-aux/meson_post_install.py
-    patchShebangs build-aux/meson_post_install.py
-  '';
-
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = gitUpdater {
+      # Upstream frequently tags these to fix flatpak builds, which are mostly irrelevant to us.
+      ignoredVersions = "-";
+      rev-prefix = "v";
+    };
   };
 
   meta = {
@@ -80,10 +77,10 @@ stdenv.mkDerivation rec {
       editor with language recognition, and visualize SELECT results in a
       Gtk.Grid Widget.
     '';
-    homepage = "https://github.com/Alecaddd/sequeler";
-    license = lib.licenses.gpl3;
+    homepage = "https://github.com/ellie-commons/sequeler";
+    license = lib.licenses.gpl3Plus;
     teams = [ lib.teams.pantheon ];
     platforms = lib.platforms.linux;
-    mainProgram = "com.github.alecaddd.sequeler";
+    mainProgram = "io.github.ellie_commons.sequeler";
   };
 }

pkgs/development/libraries/libgda/5.x.nix

@@ -8,6 +8,7 @@
   libxml2,
   gtk3,
   openssl,
+  gettext,
   gnome,
   gobject-introspection,
   vala,
@@ -46,12 +47,24 @@ stdenv.mkDerivation rec {
 
     # Fix configure detection of features with c99.
     ./0001-gcc14-fix.patch
+
+    # Fix build with gettext 0.25
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/libgda5/raw/945495e5c6cdd98a5360eff77245421876a97a57/f/gettext.patch";
+      hash = "sha256-DOCsCbx+HLZvlpMgSQrW5YoWl/EhDuQEln18YDqgCVk=";
+    })
+    # Fix conflicting types
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/libgda5/raw/76be2c07cb747ce30cc63da21662abb589814404/f/types.patch";
+      hash = "sha256-LdvDQm7p0uWznBCD8qhJ5h44zNWLmI0BoqYPCeTBN9M=";
+    })
   ];
 
   nativeBuildInputs = [
     pkg-config
     intltool
     itstool
+    gettext
     gobject-introspection
     vala
     autoreconfHook