public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

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

3
pkgs/top-level/perl-packages.nix
View File

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