diff options
6 files changed, 60 insertions, 13 deletions
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 1c12a8bc81cd..3c9f9c54dd39 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "timescaledb-parallel-copy-${version}"; - version = "2018-05-14"; + name = "timescaledb-parallel-copy"; + version = "0.2.0"; owner = "timescale"; repo = "timescaledb-parallel-copy"; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { inherit owner repo; - rev = "20d3e8f8219329f2f4b0a5aa985f280dd04d10bb"; - sha256 = "0waaccw991cnxaxjdxh9ksb94kiiyx1r7gif6pkd5k58js0kfvdn"; + rev = version; + sha256 = "1z9vf29vrxqs8imbisv681d02p4cfk3hlsrin6hhibxf1h0br9gd"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix index c672611e09c1..ac145fcd34ed 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/jmoiron/sqlx"; fetch = { type = "git"; url = "https://github.com/jmoiron/sqlx"; - rev = "0dae4fefe7c0e190f7b5a78dac28a1c82cc8d849"; - sha256 = "0r8fyj70n0v84byvagw8w8rzz532s94mjr72b9sx018j0b6xglmy"; + rev = "82935fac6c1a317907c8f43ed3f7f85ea844a78b"; + sha256 = "0cbscnss2ifc3qgmy97i0zbirrp4hix4jlcz853f4bg5n2zzgwh2"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8"; - sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + rev = "7aad666537ab32b76f0966145530335f1fed51fd"; + sha256 = "12qczn5afbf6203wnbpay1kazzh20jg5qyakrph3j1r13n91nc1r"; }; } ] diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix new file mode 100644 index 000000000000..34a7ee4b66c8 --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "timescaledb-tune"; + version = "0.5.0"; + + goPackagePath = "github.com/timescale/timescaledb-tune"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "timescale"; + repo = name; + rev = version; + sha256 = "1fs7ggpdik3qjvjmair1svni2sw9wz54716m2iwngv8x4s9b15nn"; + }; + + meta = with stdenv.lib; { + description = "A tool for tuning your TimescaleDB for better performance"; + homepage = https://github.com/timescale/timescaledb-tune; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/tools/database/timescaledb-tune/deps.nix b/pkgs/development/tools/database/timescaledb-tune/deps.nix new file mode 100644 index 000000000000..d898770fd4ef --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-tune/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; + sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + }; + } + { + goPackagePath = "github.com/pbnjay/memory"; + fetch = { + type = "git"; + url = "https://github.com/pbnjay/memory"; + rev = "974d429e7ae40c89e7dcd41cfcc22a0bfbe42510"; + sha256 = "0kazg5psdn90pqadrzma5chdwh0l2by9z31sspr47gx93fhjmkkq"; + }; + } +] diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 3c53054ba7de..9a664bc25188 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "1.0.0"; + version = "1.2.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1359jc0dw8q3f0iipqfadzs8lvri9qa5w59ziz00x1d09ppw2q40"; + sha256 = "1fb1ab07jmgd1drinl25mbhwx966f75c7i7nh3ah0xf3cbk298xr"; }; # Fix the install phase which tries to install into the pgsql extension dir, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/extension\"" done - for x in src/CMakeLists.txt src/loader/CMakeLists.txt; do + for x in src/CMakeLists.txt src/loader/CMakeLists.txt tsl/src/CMakeLists.txt; do substituteInPlace "$x" \ --replace 'DESTINATION ''${PG_PKGLIBDIR}' "DESTINATION \"$out/lib\"" done @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = https://www.timescale.com/; maintainers = with maintainers; [ volth ]; - platforms = platforms.linux; + platforms = postgresql.meta.platforms; license = licenses.asl20; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 959f1aa250e6..c39fafb320e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14297,6 +14297,8 @@ in timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { }; + timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; + inherit (import ../servers/sql/postgresql pkgs) postgresql_9_4 postgresql_9_5 |