about summary refs log tree commit diff
path: root/pkgs/servers/sql
diff options
context:
space:
mode:
authordanbst <abcz2.uprola@gmail.com>2019-08-15 01:36:59 +0300
committerdanbst <abcz2.uprola@gmail.com>2019-08-15 01:36:59 +0300
commit954c0fd2fa3f05c5a0851696ea311550c1e36212 (patch)
tree9f27ab1e4d595255077b196a25efbb606880d013 /pkgs/servers/sql
parent2c06560593d58f3d651b8de8c00d71440ed452e9 (diff)
downloadnixlib-954c0fd2fa3f05c5a0851696ea311550c1e36212.tar
nixlib-954c0fd2fa3f05c5a0851696ea311550c1e36212.tar.gz
nixlib-954c0fd2fa3f05c5a0851696ea311550c1e36212.tar.bz2
nixlib-954c0fd2fa3f05c5a0851696ea311550c1e36212.tar.lz
nixlib-954c0fd2fa3f05c5a0851696ea311550c1e36212.tar.xz
nixlib-954c0fd2fa3f05c5a0851696ea311550c1e36212.tar.zst
nixlib-954c0fd2fa3f05c5a0851696ea311550c1e36212.zip
postgresqlPackages: fix build of several PG plugins and add `postgresql11Packages`
Leftovers from https://github.com/NixOS/nixpkgs/commit/80aadbec604245071e73d5db57a282b830e6b2a9

`postgresql11Packages` are added to be built by Hydra as mainline PG plugins.
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r--pkgs/servers/sql/postgresql/ext/cstore_fdw.nix2
-rw-r--r--pkgs/servers/sql/postgresql/ext/pg_bigm.nix2
-rw-r--r--pkgs/servers/sql/postgresql/ext/pg_cron.nix2
-rw-r--r--pkgs/servers/sql/postgresql/ext/pg_hll.nix2
-rw-r--r--pkgs/servers/sql/postgresql/ext/pg_partman.nix3
-rw-r--r--pkgs/servers/sql/postgresql/ext/pg_topn.nix2
-rw-r--r--pkgs/servers/sql/postgresql/ext/temporal_tables.nix2
7 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index f2e814543dbf..2866c94d3d7f 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/{lib,share/extension}
+    mkdir -p $out/{lib,share/postgresql/extension}
 
     cp *.so      $out/lib
     cp *.sql     $out/share/postgresql/extension
diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
index a8e5a54bc29a..055d1de3c788 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin    # For buildEnv to setup proper symlinks. See #22653
-    mkdir -p $out/{lib,share/extension}
+    mkdir -p $out/{lib,share/postgresql/extension}
 
     cp *.so      $out/lib
     cp *.sql     $out/share/postgresql/extension
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index d2d2a00ffd5a..15d670171899 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/{lib,share/extension}
+    mkdir -p $out/{lib,share/postgresql/extension}
 
     cp *.so      $out/lib
     cp *.sql     $out/share/postgresql/extension
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
index bccec1107b9a..040ff8b80fe7 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/{lib,share/extension}
+    mkdir -p $out/{lib,share/postgresql/extension}
 
     cp *.so      $out/lib
     cp *.sql     $out/share/postgresql/extension
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index 38e86fbfd8d6..5fbe757598cc 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/bin    # For buildEnv to setup proper symlinks. See #22653
-    mkdir -p $out/{lib,share/extension}
+    mkdir -p $out/{lib,share/postgresql/extension}
 
     cp src/*.so      $out/lib
     cp updates/*     $out/share/postgresql/extension
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index 1a5aa91ae6ec..b9015be781e9 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/{lib,share/extension}
+    mkdir -p $out/{lib,share/postgresql/extension}
 
     cp *.so      $out/lib
     cp *.sql     $out/share/postgresql/extension
diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
index ac0299208f81..7a4b1ed88fc4 100644
--- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
+++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/{bin,lib,share/extension}
+    mkdir -p $out/{lib,share/postgresql/extension}
 
     cp *.so      $out/lib
     cp *.sql     $out/share/postgresql/extension