diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-21 08:29:51 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-21 08:29:51 +0200 |
| commit | 803b3d296c7fbc4daf5ae4d712204f8b28c0834a (patch) | |
| tree | afb2a1e3e1489050764a358d850e4804e516587c /pkgs/servers | |
| parent | d2d7fbc431a06ec58f537921dc1b898167a69adc (diff) | |
| parent | b71232fc53af1d7c7fcbb05d3e42ff5f562912ca (diff) | |
| download | nixpkgs-803b3d296c7fbc4daf5ae4d712204f8b28c0834a.tar nixpkgs-803b3d296c7fbc4daf5ae4d712204f8b28c0834a.tar.gz nixpkgs-803b3d296c7fbc4daf5ae4d712204f8b28c0834a.tar.bz2 nixpkgs-803b3d296c7fbc4daf5ae4d712204f8b28c0834a.tar.lz nixpkgs-803b3d296c7fbc4daf5ae4d712204f8b28c0834a.tar.xz nixpkgs-803b3d296c7fbc4daf5ae4d712204f8b28c0834a.tar.zst nixpkgs-803b3d296c7fbc4daf5ae4d712204f8b28c0834a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dns/https-dns-proxy/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 |
2 files changed, 36 insertions, 2 deletions
diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix new file mode 100644 index 00000000000..6f2cb504803 --- /dev/null +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, gtest, c-ares, curl, libev }: + +stdenv.mkDerivation rec { + pname = "https-dns-proxy"; + # there are no stable releases (yet?) + version = "unstable-20200419"; + + src = fetchFromGitHub { + owner = "aarond10"; + repo = "https_dns_proxy"; + rev = "79fc7b085e3b1ad64c8332f7115dfe2bf5f1f3e4"; + sha256 = "1cdfswfjby4alp6gy7yyjm76kfyclh5ax0zadnqs2pyigg9plh0b"; + }; + + nativeBuildInputs = [ cmake gtest ]; + + buildInputs = [ c-ares curl libev ]; + + installPhase = '' + install -Dm555 -t $out/bin https_dns_proxy + install -Dm444 -t $out/share/doc/${pname} ../{LICENSE,README}.* + ''; + + # upstream wants to add tests and the gtest framework is in place, so be ready + # for when that happens despite there being none as of right now + doCheck = true; + + meta = with stdenv.lib; { + description = "DNS to DNS over HTTPS (DoH) proxy"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 606eaeb65ac..cda9244e192 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.6.1"; + version = "1.7.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0k03aqpc1faqlpw46wazv0dy0xja57cv1sr1zwmizw3j3p3s0zdq"; + sha256 = "0n234ard9sldpbdqvbq2i48xyiyj8ljirsbspsax11f8yzy9ziac"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; |