summary refs log tree commit diff
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2018-08-06 10:17:49 -0500
committerAustin Seipp <aseipp@pobox.com>2019-01-19 17:33:32 -0600
commit73f56ae19126109caa02bdfdc42ac2e633de00be (patch)
tree40caf4b77ae74309107f2585fa350ae935207d98
parent3cac5996285404808282164af34379e5393117b7 (diff)
downloadnixpkgs-73f56ae19126109caa02bdfdc42ac2e633de00be.tar
nixpkgs-73f56ae19126109caa02bdfdc42ac2e633de00be.tar.gz
nixpkgs-73f56ae19126109caa02bdfdc42ac2e633de00be.tar.bz2
nixpkgs-73f56ae19126109caa02bdfdc42ac2e633de00be.tar.lz
nixpkgs-73f56ae19126109caa02bdfdc42ac2e633de00be.tar.xz
nixpkgs-73f56ae19126109caa02bdfdc42ac2e633de00be.tar.zst
nixpkgs-73f56ae19126109caa02bdfdc42ac2e633de00be.zip
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 <aseipp@pobox.com>
-rw-r--r--pkgs/servers/sql/postgresql/default.nix8
-rw-r--r--pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks-94.patch (renamed from pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch)0
-rw-r--r--pkgs/servers/sql/postgresql/patches/disable-resolve_symlinks.patch (renamed from pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch)0
-rw-r--r--pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path-96.patch (renamed from pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch)0
-rw-r--r--pkgs/servers/sql/postgresql/patches/hardcode-pgxs-path.patch (renamed from pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch)0
-rw-r--r--pkgs/servers/sql/postgresql/patches/less-is-more-96.patch (renamed from pkgs/servers/sql/postgresql/less-is-more-96.patch)0
-rw-r--r--pkgs/servers/sql/postgresql/patches/less-is-more.patch (renamed from pkgs/servers/sql/postgresql/less-is-more.patch)0
-rw-r--r--pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch (renamed from pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch)0
8 files changed, 4 insertions, 4 deletions
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
index fadeea90ac4..fadeea90ac4 100644
--- a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch
+++ b/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
index 3e6fd5e838a..3e6fd5e838a 100644
--- a/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch
+++ b/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
index 6cd449769ba..6cd449769ba 100644
--- a/pkgs/servers/sql/postgresql/hardcode-pgxs-path-96.patch
+++ b/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
index 355813ffe20..355813ffe20 100644
--- a/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch
+++ b/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
index f14af9dc220..f14af9dc220 100644
--- a/pkgs/servers/sql/postgresql/less-is-more-96.patch
+++ b/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
index d640d24bdaa..d640d24bdaa 100644
--- a/pkgs/servers/sql/postgresql/less-is-more.patch
+++ b/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
index fe95d2ee99f..fe95d2ee99f 100644
--- a/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch
+++ b/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch