From 73f56ae19126109caa02bdfdc42ac2e633de00be Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 6 Aug 2018 10:17:49 -0500 Subject: [PATCH] nixpkgs: move postgresql patches into a common directory This simply makes it easier to browse the PostgreSQL package directory. More to come. Signed-off-by: Austin Seipp --- pkgs/servers/sql/postgresql/default.nix | 8 ++++---- .../{ => patches}/disable-resolve_symlinks-94.patch | 0 .../{ => patches}/disable-resolve_symlinks.patch | 0 .../postgresql/{ => patches}/hardcode-pgxs-path-96.patch | 0 .../sql/postgresql/{ => patches}/hardcode-pgxs-path.patch | 0 .../sql/postgresql/{ => patches}/less-is-more-96.patch | 0 .../sql/postgresql/{ => patches}/less-is-more.patch | 0 .../{ => patches}/specify_pkglibdir_at_runtime.patch | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/servers/sql/postgresql/{ => patches}/disable-resolve_symlinks-94.patch (100%) rename pkgs/servers/sql/postgresql/{ => patches}/disable-resolve_symlinks.patch (100%) rename pkgs/servers/sql/postgresql/{ => patches}/hardcode-pgxs-path-96.patch (100%) rename pkgs/servers/sql/postgresql/{ => patches}/hardcode-pgxs-path.patch (100%) rename pkgs/servers/sql/postgresql/{ => patches}/less-is-more-96.patch (100%) rename pkgs/servers/sql/postgresql/{ => patches}/less-is-more.patch (100%) rename pkgs/servers/sql/postgresql/{ => patches}/specify_pkglibdir_at_runtime.patch (100%) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b8c06d5ec2f..2b22c36e829 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -48,10 +48,10 @@ let ] ++ lib.optionals icuEnabled [ "--with-icu" ]; patches = - [ (if atLeast "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) - (if atLeast "9.6" then ./less-is-more-96.patch else ./less-is-more.patch) - (if atLeast "9.6" then ./hardcode-pgxs-path-96.patch else ./hardcode-pgxs-path.patch) - ./specify_pkglibdir_at_runtime.patch + [ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch) + (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch) + (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) + ./patches/specify_pkglibdir_at_runtime.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch similarity index 100% rename from pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch rename to pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch b/pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch similarity index 100% rename from pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch rename to pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch similarity index 100% rename from pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch rename to pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch b/pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch similarity index 100% rename from pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch rename to pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch diff --git a/pkgs/servers/sql/postgresql/less-is-more-96.patch b/pkgs/servers/sql/postgresql/patches/less-is-more-96.patch similarity index 100% rename from pkgs/servers/sql/postgresql/less-is-more-96.patch rename to pkgs/servers/sql/postgresql/patches/less-is-more-96.patch diff --git a/pkgs/servers/sql/postgresql/less-is-more.patch b/pkgs/servers/sql/postgresql/patches/less-is-more.patch similarity index 100% rename from pkgs/servers/sql/postgresql/less-is-more.patch rename to pkgs/servers/sql/postgresql/patches/less-is-more.patch diff --git a/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch b/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch similarity index 100% rename from pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch rename to pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch