libdbi-drivers{,-base}: rename from libdbiDrivers{,Base}
This commit is contained in:
@@ -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 ];
|
||||
|
||||
|
||||
@@ -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}"}
|
||||
)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user