diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:44:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:45:21 +0200 |
| commit | cbabebcc2e3b884296fedf8591e04f59240b3939 (patch) | |
| tree | 54f637fbb59548753ac613ec3e4f56aae97a5e6e /pkgs/servers/sql | |
| parent | 7a22083e1271869294a074cbe7a971f2d8abb4f4 (diff) | |
| parent | 93147d737d24f55d8da7257e24d840c9f9b1fe6c (diff) | |
| download | nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.gz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.bz2 nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.lz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.xz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.zst nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/timescaledb/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 4eb8d717309d..a5c27eb7ec95 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -29,7 +29,7 @@ let "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" - "--with-system-tzdata=${tzdata}" + "--with-system-tzdata=${tzdata}/share/zoneinfo" (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ]; diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index 1eaa7775793c..fab515035ce6 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.10.1"; + version = "0.11.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "07qkkf7lbwaig26iia54vdakwmv33f71p8saqifz9lf0zy6xn0w0"; + sha256 = "06xysf45r0c2sjfl6vgdbrm7pn7nxx2n0k29bm88q0ipyyp9fr0v"; }; # Fix the install phase which tries to install into the pgsql extension dir, |