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

postgresql92: remove last references

Browse Source
This commit is contained in:
Franz Pletz 2017-09-05 18:17:22 +02:00
parent 94a4183bda
commit 1bed4773f5
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/administration/declarative-containers.xml
View File

@ -16,7 +16,7 @@ containers.database =
{ config = { config =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql92; services.postgresql.package = pkgs.postgresql96;
}; };
}; };
</programlisting> </programlisting>

2
nixos/modules/services/databases/postgresql.nix
View File

@ -59,7 +59,7 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
example = literalExample "pkgs.postgresql92"; example = literalExample "pkgs.postgresql96";
description = '' description = ''
PostgreSQL package to use. PostgreSQL package to use.
''; '';

2
nixos/modules/virtualisation/containers.nix
View File

@ -595,7 +595,7 @@ in
{ config = { config =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql92; services.postgresql.package = pkgs.postgresql96;
}; };
}; };
} }

2
nixos/tests/trac.nix
View File

@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ... }: {
postgresql = postgresql =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql92; services.postgresql.package = pkgs.postgresql;
services.postgresql.enableTCPIP = true; services.postgresql.enableTCPIP = true;
services.postgresql.authentication = '' services.postgresql.authentication = ''
# Generated file; do not edit! # Generated file; do not edit!

4
pkgs/development/tools/misc/hydra/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub { stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
, guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc , guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, fetchpatch, pixz }: , rpm, dpkg, cdrkit, fetchpatch, pixz }:
@ -78,7 +78,7 @@ in releaseTools.nixBuild rec {
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support guile # optional, for Guile + Guix support
perlDeps perl nixUnstable perlDeps perl nixUnstable
postgresql92 # for running the tests postgresql # for running the tests
(lib.overrideDerivation (aws-sdk-cpp.override { (lib.overrideDerivation (aws-sdk-cpp.override {
apis = ["s3"]; apis = ["s3"];
customMemoryManagement = false; customMemoryManagement = false;

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

@ -11549,7 +11549,6 @@ with pkgs;
vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
pgpool92 = pgpool.override { postgresql = postgresql92; };
pgpool93 = pgpool.override { postgresql = postgresql93; }; pgpool93 = pgpool.override { postgresql = postgresql93; };
pgpool94 = pgpool.override { postgresql = postgresql94; }; pgpool94 = pgpool.override { postgresql = postgresql94; };