Unverified Commit 1122fb51 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #264250 from Ma27/rm-postgres-11 

postgresql_11: remove
parents b84c09e7 279cecf6

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -488,6 +488,8 @@ The module update takes care of the new config syntax and the data itself (user 


  If you use this feature, updates to CoreDNS may require updating `vendorHash` by following these steps again.



- `postgresql_11` has been removed since it'll stop receiving fixes on November 9 2023.



- `ffmpeg` default upgraded from `ffmpeg_5` to `ffmpeg_6`.



- `fusuma` now enables the following plugins: [appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher), [keypress](https://github.com/iberianpig/fusuma-plugin-keypress), [sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey), [tap](https://github.com/iberianpig/fusuma-plugin-tap) and [wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl).

nixos/modules/services/backup/postgresql-wal-receiver.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ let 
    options = {

      postgresqlPackage = mkOption {

        type = types.package;

        example = literalExpression "pkgs.postgresql_11";

        example = literalExpression "pkgs.postgresql_15";

        description = lib.mdDoc ''

          PostgreSQL package to use.

        '';
@@ -124,7 +124,7 @@ in { 
        example = literalExpression ''

          {

            main = {

              postgresqlPackage = pkgs.postgresql_11;

              postgresqlPackage = pkgs.postgresql_15;

              directory = /mnt/pg_wal/main/;

              slot = "main_wal_receiver";

              connection = "postgresql://user@somehost";

nixos/modules/services/databases/postgresql.md

+16 −16
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ PostgreSQL is an advanced, free relational database. 
To enable PostgreSQL, add the following to your {file}`configuration.nix`:

```

services.postgresql.enable = true;

services.postgresql.package = pkgs.postgresql_11;

services.postgresql.package = pkgs.postgresql_15;

```

Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_11`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL.

Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_15`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL.



<!--

After running {command}`nixos-rebuild`, you can verify
@@ -119,27 +119,27 @@ A complete list of options for the PostgreSQL module may be found [here](#opt-se 


## Plugins {#module-services-postgres-plugins}



Plugins collection for each PostgreSQL version can be accessed with `.pkgs`. For example, for `pkgs.postgresql_11` package, its plugin collection is accessed by `pkgs.postgresql_11.pkgs`:

Plugins collection for each PostgreSQL version can be accessed with `.pkgs`. For example, for `pkgs.postgresql_15` package, its plugin collection is accessed by `pkgs.postgresql_15.pkgs`:

```ShellSession

$ nix repl '<nixpkgs>'



Loading '<nixpkgs>'...

Added 10574 variables.



nix-repl> postgresql_11.pkgs.<TAB><TAB>

postgresql_11.pkgs.cstore_fdw        postgresql_11.pkgs.pg_repack

postgresql_11.pkgs.pg_auto_failover  postgresql_11.pkgs.pg_safeupdate

postgresql_11.pkgs.pg_bigm           postgresql_11.pkgs.pg_similarity

postgresql_11.pkgs.pg_cron           postgresql_11.pkgs.pg_topn

postgresql_11.pkgs.pg_hll            postgresql_11.pkgs.pgjwt

postgresql_11.pkgs.pg_partman        postgresql_11.pkgs.pgroonga

nix-repl> postgresql_15.pkgs.<TAB><TAB>

postgresql_15.pkgs.cstore_fdw        postgresql_15.pkgs.pg_repack

postgresql_15.pkgs.pg_auto_failover  postgresql_15.pkgs.pg_safeupdate

postgresql_15.pkgs.pg_bigm           postgresql_15.pkgs.pg_similarity

postgresql_15.pkgs.pg_cron           postgresql_15.pkgs.pg_topn

postgresql_15.pkgs.pg_hll            postgresql_15.pkgs.pgjwt

postgresql_15.pkgs.pg_partman        postgresql_15.pkgs.pgroonga

...

```



To add plugins via NixOS configuration, set `services.postgresql.extraPlugins`:

```

services.postgresql.package = pkgs.postgresql_11;

services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [

services.postgresql.package = pkgs.postgresql_12;

services.postgresql.extraPlugins = with pkgs.postgresql_12.pkgs; [

  pg_repack

  postgis

];
@@ -148,7 +148,7 @@ services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ 
You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function `.withPackages`. For example, creating a custom PostgreSQL package in an overlay can look like:

```

self: super: {

  postgresql_custom = self.postgresql_11.withPackages (ps: [

  postgresql_custom = self.postgresql_12.withPackages (ps: [

    ps.pg_repack

    ps.postgis

  ]);
@@ -158,9 +158,9 @@ self: super: { 
Here's a recipe on how to override a particular plugin through an overlay:

```

self: super: {

  postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // {

    pkgs = super.postgresql_11.pkgs // {

      pg_repack = super.postgresql_11.pkgs.pg_repack.overrideAttrs (_: {

  postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // {

    pkgs = super.postgresql_15.pkgs // {

      pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: {

        name = "pg_repack-v20181024";

        src = self.fetchzip {

          url = "https://github.com/reorg/pg_repack/archive/923fa2f3c709a506e111cc963034bf2fd127aa00.tar.gz";

nixos/modules/services/databases/postgresql.nix

+5 −5
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ in 


      package = mkOption {

        type = types.package;

        example = literalExpression "pkgs.postgresql_11";

        example = literalExpression "pkgs.postgresql_15";

        description = lib.mdDoc ''

          PostgreSQL package to use.

        '';
@@ -78,7 +78,7 @@ in 
      dataDir = mkOption {

        type = types.path;

        defaultText = literalExpression ''"/var/lib/postgresql/''${config.services.postgresql.package.psqlSchema}"'';

        example = "/var/lib/postgresql/11";

        example = "/var/lib/postgresql/15";

        description = lib.mdDoc ''

          The data directory for PostgreSQL. If left as the default value

          this directory will automatically be created before the PostgreSQL server starts, otherwise
@@ -387,7 +387,7 @@ in 
      extraPlugins = mkOption {

        type = types.listOf types.path;

        default = [];

        example = literalExpression "with pkgs.postgresql_11.pkgs; [ postgis pg_repack ]";

        example = literalExpression "with pkgs.postgresql_15.pkgs; [ postgis pg_repack ]";

        description = lib.mdDoc ''

          List of PostgreSQL plugins. PostgreSQL version for each plugin should

          match version for `services.postgresql.package` value.
@@ -399,7 +399,7 @@ in 
        default = {};

        description = lib.mdDoc ''

          PostgreSQL configuration. Refer to

          <https://www.postgresql.org/docs/11/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE>

          <https://www.postgresql.org/docs/15/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE>

          for an overview of `postgresql.conf`.



          ::: {.note}
@@ -461,7 +461,7 @@ in 
        base = if versionAtLeast config.system.stateVersion "23.11" then pkgs.postgresql_15

            else if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14

            else if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13

            else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11

            else if versionAtLeast config.system.stateVersion "20.03" then mkThrow "11"

            else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6"

            else mkThrow "9_5";

    in

nixos/tests/postgresql.nix

+1 −3
Original line number Diff line number Diff line
@@ -219,8 +219,6 @@ let 
in

  concatMapAttrs (name: package: {

    ${name} = make-postgresql-test name package false;

    ${name + "-backup-all"} = make-postgresql-test "${name + "-backup-all"}" package true;

    ${name + "-clauses"} = mk-ensure-clauses-test name package;

  }) postgresql-versions
 
  // {

    postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true;

  }