Unverified Commit 6af7e814 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #292993 from wolfgangwalther/postgresql-refactor 

postgresql: refactor and cleanup
parents d240fbc9 01444957

nixos/modules/services/databases/postgresql.md

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ self: super: { 
Here's a recipe on how to override a particular plugin through an overlay:

```

self: super: {

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

  postgresql_15 = super.postgresql_15// {

    pkgs = super.postgresql_15.pkgs // {

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

        name = "pg_repack-v20181024";

nixos/modules/services/databases/postgresql.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ let 
      #     package = pkgs.postgresql_<major>;

      #   };

      # works.

      base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package;

      base = if cfg.enableJIT then cfg.package.withJIT else cfg.package;

    in

    if cfg.extraPlugins == []

      then base

pkgs/servers/sql/postgresql/12.nix

0 → 100644
+10 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "12.18";

  hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo=";

  muslPatches = {

    icu-collations-hack = {

      url = "https://git.alpinelinux.org/aports/plain/testing/postgresql12/icu-collations-hack.patch?id=d5227c91adda59d4e7f55f13468f0314e8869174";

      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";

    };

  };

}

pkgs/servers/sql/postgresql/13.nix

0 → 100644
+14 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "13.14";

  hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0=";

  muslPatches = {

    icu-collations-hack = {

      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";

      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";

    };

    disable-test-collate-icu-utf8 = {

      url = "https://git.alpinelinux.org/aports/plain/main/postgresql13/disable-test-collate.icu.utf8.patch?id=69faa146ec9fff3b981511068f17f9e629d4688b";

      hash = "sha256-jS/qxezaiaKhkWeMCXwpz1SDJwUWn9tzN0uKaZ3Ph2Y=";

    };

  };

}

pkgs/servers/sql/postgresql/14.nix

0 → 100644
+14 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "14.11";

  hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg=";

  muslPatches = {

    icu-collations-hack = {

      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/icu-collations-hack.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";

      hash = "sha256-wuwjvGHArkRNwFo40g3p43W32OrJohretlt6iSRlJKg=";

    };

    disable-test-collate-icu-utf8 = {

      url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7";

      hash = "sha256-jXe23AxnFjEl+TZQm4R7rStk2Leo08ctxMNmu1xr5zM=";

    };

  };

}