diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-17 10:31:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-17 10:31:52 +0100 |
| commit | 3864800226f7fa9063ba520e4a2d92426a75a2c7 (patch) | |
| tree | cf38196621a1fb2765246e5253ee8be4b9f3b6f4 /pkgs/servers | |
| parent | be7125dde7d3521725cf2e2ea70b3c309eebd0e4 (diff) | |
| parent | 056bda4714dfb438761e6ad788501d750beb8aa0 (diff) | |
| download | nixlib-3864800226f7fa9063ba520e4a2d92426a75a2c7.tar nixlib-3864800226f7fa9063ba520e4a2d92426a75a2c7.tar.gz nixlib-3864800226f7fa9063ba520e4a2d92426a75a2c7.tar.bz2 nixlib-3864800226f7fa9063ba520e4a2d92426a75a2c7.tar.lz nixlib-3864800226f7fa9063ba520e4a2d92426a75a2c7.tar.xz nixlib-3864800226f7fa9063ba520e4a2d92426a75a2c7.tar.zst nixlib-3864800226f7fa9063ba520e4a2d92426a75a2c7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/bird/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/documize-community/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/gortr/default.nix | 22 |
3 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 7ac7bc8e918e..2cc27eda1d4d 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline }: +{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh }: with lib; @@ -15,7 +15,7 @@ let }; nativeBuildInputs = [ flex bison ]; - buildInputs = [ readline ]; + buildInputs = [ readline libssh ]; patches = [ (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index e6b7e2be125d..2cc6b2a9f74d 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "documize-community"; - version = "3.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "documize"; repo = "community"; rev = "v${version}"; - sha256 = "17dzj24dc3f6bw8v4fsj578gfz0fcvh42a2srci580s41mq2kjy4"; + sha256 = "1y38lgkxhyrga44wj216vl08fzyv8wbk02a85flnihrb4b1092x0"; }; goPackagePath = "github.com/documize/community"; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix new file mode 100644 index 000000000000..375631d5cbf8 --- /dev/null +++ b/pkgs/servers/gortr/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gortr"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = pname; + rev = "v${version}"; + sha256 = "1kg42qynqqj05bvfwzd77mpl63y3gnkk15x2a4rspxf4w1ziaxkr"; + }; + modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; + + meta = with lib; { + description = "The RPKI-to-Router server used at Cloudflare"; + homepage = "https://github.com/cloudflare/gortr/"; + license = licenses.gpl3; + maintainers = with maintainers; [ petabyteboy ]; + platforms = platforms.all; + }; +} |