diff --git a/pkgs/by-name/li/libgdamm/package.nix b/pkgs/by-name/li/libgdamm/package.nix index 074a8167e9a0..02b5014e4741 100644 --- a/pkgs/by-name/li/libgdamm/package.nix +++ b/pkgs/by-name/li/libgdamm/package.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, glibmm, - libgda, + libgda5, libxml2, gnome, mysqlSupport ? false, @@ -12,7 +12,7 @@ }: let - gda = libgda.override { + gda = libgda5.override { inherit mysqlSupport postgresSupport; }; in diff --git a/pkgs/by-name/pl/planner/package.nix b/pkgs/by-name/pl/planner/package.nix index 24b026d257d1..4539fa878bda 100644 --- a/pkgs/by-name/pl/planner/package.nix +++ b/pkgs/by-name/pl/planner/package.nix @@ -6,7 +6,7 @@ gsettings-desktop-schemas, glib, gtk3, - libgda, + libgda5, libxml2, libxslt, makeWrapper, @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libgda + libgda5 libxml2 libxslt glib diff --git a/pkgs/by-name/se/sequeler/package.nix b/pkgs/by-name/se/sequeler/package.nix index 798b8503ad6a..bff7c1c6bab3 100644 --- a/pkgs/by-name/se/sequeler/package.nix +++ b/pkgs/by-name/se/sequeler/package.nix @@ -15,7 +15,7 @@ gtk3, glib, libgee, - libgda, + libgda5, gtksourceview, libxml2, libsecret, @@ -23,7 +23,7 @@ }: let - sqlGda = libgda.override { + sqlGda = libgda5.override { mysqlSupport = true; postgresSupport = true; }; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/5.x.nix similarity index 92% rename from pkgs/development/libraries/libgda/default.nix rename to pkgs/development/libraries/libgda/5.x.nix index f3239b80c5c3..6c58fd6e5c6d 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/5.x.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { version = "5.2.10"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-b2zfe4BT9VO5B+DIimBk60jPJ1GFLrJDI9zwJ3kjNMg="; + url = "mirror://gnome/sources/libgda/${lib.versions.majorMinor version}/libgda-${version}.tar.xz"; + hash = "sha256-1j1l4dwjgw6w4d1v4bl5a4kwyj7bcih8mj700ywm7xakh1xxyv3g"; }; patches = [ @@ -97,7 +97,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgda"; + attrPath = "libgda5"; versionPolicy = "odd-unstable"; freeze = true; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index df23115bb549..79dc5dd6a318 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -677,6 +677,7 @@ mapAliases { libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28 libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 + libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21 libgme = game-music-emu; # Added 2022-07-20 libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e624e8e2080..257671f33092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9544,7 +9544,7 @@ with pkgs; extraOnly = true; }; - libgda = callPackage ../development/libraries/libgda { }; + libgda5 = callPackage ../development/libraries/libgda/5.x.nix { }; libgda6 = callPackage ../development/libraries/libgda/6.x.nix { };