perl-packages.nix, all-packages.nix: generally refer to 'postgresql' instead of 'postgresql92'

This allows users to override the 'postgres' attribute with a different version
and have the effect propagated to all other packages that depend on it.
This commit is contained in:
Peter Simons 2013-04-06 15:24:11 +02:00
parent d81e8a9cc3
commit cde41fe551
2 changed files with 4 additions and 7 deletions

View file

@ -5547,9 +5547,7 @@ let
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc {
postgresql = postgresql91;
};
psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };
pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
inherit xmpppy pythonIRClib python makeWrapper;
@ -7693,7 +7691,7 @@ let
ratpoison = callPackage ../applications/window-managers/ratpoison { };
rawtherapee = callPackage ../applications/graphics/rawtherapee {
fftw = fftw.override {float = true;};
fftw = fftw.override {float = true;};
};
rcs = callPackage ../applications/version-management/rcs { };
@ -7993,7 +7991,7 @@ let
wings = callPackage ../applications/graphics/wings {
erlang = erlangR14B04;
esdl = esdl.override { erlang = erlangR14B04; };
esdl = esdl.override { erlang = erlangR14B04; };
};
wmname = callPackage ../applications/misc/wmname { };

View file

@ -1518,8 +1518,7 @@ rec {
};
DBDPg = import ../development/perl-modules/DBD-Pg {
inherit stdenv fetchurl buildPerlPackage DBI;
postgresql = pkgs.postgresql92;
inherit stdenv fetchurl buildPerlPackage DBI postgresql;
};
DBFile = import ../development/perl-modules/DB_File {