public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

This commit is contained in:
Austin Seipp 2018-11-02 14:18:45 -05:00
parent 3378db6adf 5ca1b19dab
commit 1155e2d8e4
4 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -46,7 +46,7 @@ self: super: {
# LTS-12.x versions do not compile. # LTS-12.x versions do not compile.
base-orphans = self.base-orphans_0_8; base-orphans = self.base-orphans_0_8;
brick = doJailbreak super.brick_0_41_2; # https://github.com/jtdaugherty/brick/pull/188 brick = self.brick_0_41_2;
cassava-megaparsec = doJailbreak super.cassava-megaparsec; cassava-megaparsec = doJailbreak super.cassava-megaparsec;
config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18 config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
contravariant = self.contravariant_1_5; contravariant = self.contravariant_1_5;

26
pkgs/development/tools/database/timescaledb-parallel-copy/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "timescaledb-parallel-copy-${version}";
version = "2018-05-14";
owner = "timescale";
repo = "timescaledb-parallel-copy";
goPackagePath = with src; "github.com/${owner}/${repo}";
goDeps = ./deps.nix;
src = fetchFromGitHub {
inherit owner repo;
rev = "20d3e8f8219329f2f4b0a5aa985f280dd04d10bb";
sha256 = "0waaccw991cnxaxjdxh9ksb94kiiyx1r7gif6pkd5k58js0kfvdn";
};
meta = with stdenv.lib; {
description = "Bulk, parallel insert of CSV records into PostgreSQL";
homepage = http://github.com/timescale/timescaledb-parallel-copy;
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
};
}

21
pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix generated Normal file
View File

@ -0,0 +1,21 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
[
{
goPackagePath = "github.com/jmoiron/sqlx";
fetch = {
type = "git";
url = "https://github.com/jmoiron/sqlx";
rev = "0dae4fefe7c0e190f7b5a78dac28a1c82cc8d849";
sha256 = "0r8fyj70n0v84byvagw8w8rzz532s94mjr72b9sx018j0b6xglmy";
};
}
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
};
}
]

2
pkgs/top-level/all-packages.nix
View File

@ -13589,6 +13589,8 @@ with pkgs;
libmemcached = null; # Detection is broken upstream libmemcached = null; # Detection is broken upstream
}; };
timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
postgresql = postgresql_9_6; postgresql = postgresql_9_6;
inherit (callPackages ../servers/sql/postgresql { }) inherit (callPackages ../servers/sql/postgresql { })