commit 1bed4773f5a3a15af9886c52954c00f3d4ce27f3 · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/administration/declarative-containers.xml

···

       16
        
         { config =

     

       17
        
             { config, pkgs, ... }:

     

       18
        
             { services.postgresql.enable = true;

     

       19
       -
               services.postgresql.package = pkgs.postgresql92;

     

       20
        
             };

     

       21
        
         };

     

       22
        
       </programlisting>

···

       16
        
         { config =

     

       17
        
             { config, pkgs, ... }:

     

       18
        
             { services.postgresql.enable = true;

     

       19
       +
               services.postgresql.package = pkgs.postgresql96;

     

       20
        
             };

     

       21
        
         };

     

       22
        
       </programlisting>

+1 -1

nixos/modules/services/databases/postgresql.nix

···

       59
        
       

     

       60
        
             package = mkOption {

     

       61
        
               type = types.package;

     

       62
       -
               example = literalExample "pkgs.postgresql92";

     

       63
        
               description = ''

     

       64
        
                 PostgreSQL package to use.

     

       65
        
               '';

···

       59
        
       

     

       60
        
             package = mkOption {

     

       61
        
               type = types.package;

     

       62
       +
               example = literalExample "pkgs.postgresql96";

     

       63
        
               description = ''

     

       64
        
                 PostgreSQL package to use.

     

       65
        
               '';

+1 -1

nixos/modules/virtualisation/containers.nix

···

       595
        
                     { config =

     

       596
        
                         { config, pkgs, ... }:

     

       597
        
                         { services.postgresql.enable = true;

     

       598
       -
                           services.postgresql.package = pkgs.postgresql92;

     

       599
        
                         };

     

       600
        
                     };

     

       601
        
                 }

···

       595
        
                     { config =

     

       596
        
                         { config, pkgs, ... }:

     

       597
        
                         { services.postgresql.enable = true;

     

       598
       +
                           services.postgresql.package = pkgs.postgresql96;

     

       599
        
                         };

     

       600
        
                     };

     

       601
        
                 }

+1 -1

nixos/tests/trac.nix

···

       17
        
           postgresql =

     

       18
        
             { config, pkgs, ... }:

     

       19
        
             { services.postgresql.enable = true;

     

       20
       -
               services.postgresql.package = pkgs.postgresql92;

     

       21
        
               services.postgresql.enableTCPIP = true;

     

       22
        
               services.postgresql.authentication = ''

     

       23
        
                 # Generated file; do not edit!

···

       17
        
           postgresql =

     

       18
        
             { config, pkgs, ... }:

     

       19
        
             { services.postgresql.enable = true;

     

       20
       +
               services.postgresql.package = pkgs.postgresql;

     

       21
        
               services.postgresql.enableTCPIP = true;

     

       22
        
               services.postgresql.authentication = ''

     

       23
        
                 # Generated file; do not edit!

+2 -2

pkgs/development/tools/misc/hydra/default.nix

···

       1
        
       { stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub

     

       2
        
       , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx

     

       3
        
       , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt

     

       4
       -
       , guile, perl, postgresql92, aws-sdk-cpp, nukeReferences, git, boehmgc

     

       5
        
       , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar

     

       6
        
       , rpm, dpkg, cdrkit, fetchpatch, pixz }:

     

       7
        
       

     
···

       78
        
             gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt

     

       79
        
             guile # optional, for Guile + Guix support

     

       80
        
             perlDeps perl nixUnstable

     

       81
       -
             postgresql92 # for running the tests

     

       82
        
             (lib.overrideDerivation (aws-sdk-cpp.override {

     

       83
        
               apis = ["s3"];

     

       84
        
               customMemoryManagement = false;

···

       1
        
       { stdenv, nixUnstable, perlPackages, buildEnv, releaseTools, fetchFromGitHub

     

       2
        
       , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx

     

       3
        
       , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt

     

       4
       +
       , guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc

     

       5
        
       , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar

     

       6
        
       , rpm, dpkg, cdrkit, fetchpatch, pixz }:

     

       7
        
       

     
···

       78
        
             gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt

     

       79
        
             guile # optional, for Guile + Guix support

     

       80
        
             perlDeps perl nixUnstable

     

       81
       +
             postgresql # for running the tests

     

       82
        
             (lib.overrideDerivation (aws-sdk-cpp.override {

     

       83
        
               apis = ["s3"];

     

       84
        
               customMemoryManagement = false;

-1

pkgs/top-level/all-packages.nix

···

       11549
        
       

     

       11550
        
         vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };

     

       11551
        
       

     

       11552
       -
         pgpool92 = pgpool.override { postgresql = postgresql92; };

     

       11553
        
         pgpool93 = pgpool.override { postgresql = postgresql93; };

     

       11554
        
         pgpool94 = pgpool.override { postgresql = postgresql94; };

     

       11555

···

       11549
        
       

     

       11550
        
         vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };

     

       11551
        
       

     

       0
        
       
     

       11552
        
         pgpool93 = pgpool.override { postgresql = postgresql93; };

     

       11553
        
         pgpool94 = pgpool.override { postgresql = postgresql94; };

     

       11554