From ad60ee44067bb9dbd70509baa7b940847fdc8f8f Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 12 Feb 2026 00:07:03 +0100 Subject: [PATCH] libdbi-drivers{,-base}: rename from libdbiDrivers{,Base} --- pkgs/by-name/ga/gammu/package.nix | 4 ++-- pkgs/by-name/gn/gnucash/package.nix | 10 +++++----- .../libdbi-drivers-0.9.0-470b58e15-wait-include.patch | 0 .../libdbi-drivers-0.9.0-9f378826-compare-type.patch | 0 .../libdbi-drivers-0.9.0-buffer_overflow.patch | 0 .../libdbi-drivers-0.9.0-function-types.patch | 0 .../li/{libdbiDrivers => libdbi-drivers}/package.nix | 0 pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) rename pkgs/by-name/li/{libdbiDrivers => libdbi-drivers}/libdbi-drivers-0.9.0-470b58e15-wait-include.patch (100%) rename pkgs/by-name/li/{libdbiDrivers => libdbi-drivers}/libdbi-drivers-0.9.0-9f378826-compare-type.patch (100%) rename pkgs/by-name/li/{libdbiDrivers => libdbi-drivers}/libdbi-drivers-0.9.0-buffer_overflow.patch (100%) rename pkgs/by-name/li/{libdbiDrivers => libdbi-drivers}/libdbi-drivers-0.9.0-function-types.patch (100%) rename pkgs/by-name/li/{libdbiDrivers => libdbi-drivers}/package.nix (100%) diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix index 755dd55ee684..cbfa4693de95 100644 --- a/pkgs/by-name/ga/gammu/package.nix +++ b/pkgs/by-name/ga/gammu/package.nix @@ -15,7 +15,7 @@ dialog, dbiSupport ? false, libdbi ? null, - libdbiDrivers ? null, + libdbi-drivers ? null, postgresSupport ? false, libpq ? null, }: @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals dbiSupport [ libdbi - libdbiDrivers + libdbi-drivers ] ++ lib.optionals postgresSupport [ libpq ]; diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 5fb43dfdf35e..fdd40328aac5 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -15,7 +15,7 @@ gwenhywfar, icu, libdbi, - libdbiDrivers, + libdbi-drivers, libofx, libsecret, libxml2, @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { env = { # https://github.com/Gnucash/gnucash/commit/e680a87a66b8ec17132f186e222cbc94ad52b3d0 - GNC_DBD_DIR = "${libdbiDrivers}/lib/dbd"; + GNC_DBD_DIR = "${libdbi-drivers}/lib/dbd"; # this needs to be an environment variable and not a cmake flag to suppress # guile warning @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { gwenhywfar icu libdbi - libdbiDrivers + libdbi-drivers libofx libsecret libxml2 @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { find . -name '._*' -type f -delete substituteInPlace bindings/python/__init__.py \ - --subst-var-by gnc_dbd_dir "${libdbiDrivers}/lib/dbd" \ + --subst-var-by gnc_dbd_dir "${libdbi-drivers}/lib/dbd" \ --subst-var-by gsettings_schema_dir ${glib.makeSchemaPath "$out" "gnucash-${finalAttrs.version}"}; ''; @@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { # documentation --prefix XDG_DATA_DIRS : ${finalAttrs.passthru.docs}/share # db drivers location - --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd + --set GNC_DBD_DIR ${libdbi-drivers}/lib/dbd # gsettings schema location on Nix --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${finalAttrs.version}"} ) diff --git a/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch b/pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch similarity index 100% rename from pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch rename to pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch diff --git a/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch b/pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch similarity index 100% rename from pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch rename to pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch diff --git a/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch b/pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch similarity index 100% rename from pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch rename to pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch diff --git a/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-function-types.patch b/pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-function-types.patch similarity index 100% rename from pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-function-types.patch rename to pkgs/by-name/li/libdbi-drivers/libdbi-drivers-0.9.0-function-types.patch diff --git a/pkgs/by-name/li/libdbiDrivers/package.nix b/pkgs/by-name/li/libdbi-drivers/package.nix similarity index 100% rename from pkgs/by-name/li/libdbiDrivers/package.nix rename to pkgs/by-name/li/libdbi-drivers/package.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 45239bd1f633..9d468a32f12a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -970,6 +970,8 @@ mapAliases { libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27 libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27 libcef = throw "'libcef' has been removed, as no packages depend on it"; # Added 2025-11-06 + libdbiDrivers = warnAlias "'libdbiDrivers' has been renamed to 'libdbi-drivers'" libdbi-drivers; # Added 2026-02-08 + libdbiDriversBase = warnAlias "'libdbiDriversBase' has been renamed to 'libdbi-drivers-base'" libdbi-drivers-base; # Added 2026-02-08 libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d8df65291c2..dcca7fb1d8c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6839,7 +6839,7 @@ with pkgs; libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { }; - libdbiDriversBase = libdbiDrivers.override { + libdbi-drivers-base = libdbi-drivers.override { withMysql = false; withSqlite = false; };