diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
commit | 05e375d7103ac51e2da917965c37246c99f1ae4f (patch) | |
tree | 7ec4e9a2f5b7b1e2dea7c3e059f5b40e1dac1569 /pkgs/servers | |
parent | 335934a073d6024d54c71bf82d5f8baab13abe75 (diff) | |
parent | c7d7abc51e5f9b9c7481a83c47b37508bf08b05b (diff) | |
download | nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.gz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.bz2 nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.lz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.xz nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.zst nixlib-05e375d7103ac51e2da917965c37246c99f1ae4f.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/amqp/qpid-cpp/default.nix | 56 | ||||
-rw-r--r-- | pkgs/servers/bird/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/caddy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/neo4j/default.nix | 4 |
5 files changed, 46 insertions, 26 deletions
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index ea2c0325148b..a838fa3b904c 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,8 +1,7 @@ -{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby }: +{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: -stdenv.mkDerivation rec { +let name = "qpid-cpp-${version}"; - version = "1.37.0"; src = fetchurl { @@ -10,24 +9,45 @@ stdenv.mkDerivation rec { sha256 = "1s4hyi867i0lqn81c1crrk6fga1gmsv61675vjv5v41skz56lrsb"; }; - buildInputs = [ cmake python2 boost libuuid ruby ]; - - # the subdir managementgen wants to install python stuff in ${python} and - # the installation tries to create some folders in /var - patchPhase = '' - sed -i '/managementgen/d' CMakeLists.txt - sed -i '/ENV/d' src/CMakeLists.txt - ''; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=unused-function"; - - meta = { + meta = with stdenv.lib; { homepage = http://qpid.apache.org; repositories.git = git://git.apache.org/qpid.git; repositories.svn = http://svn.apache.org/repos/asf/qpid; description = "An AMQP message broker and a C++ messaging API"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.cpages ]; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ cpages ma27 ]; + }; + + qpid-cpp = stdenv.mkDerivation { + inherit src meta name; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost libuuid ruby python2 ]; + + # the subdir managementgen wants to install python stuff in ${python} and + # the installation tries to create some folders in /var + postPatch = '' + sed -i '/managementgen/d' CMakeLists.txt + sed -i '/ENV/d' src/CMakeLists.txt + sed -i '/management/d' CMakeLists.txt + ''; + + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=unused-function" + "-Wno-error=int-in-bool-context" + ]; + }; + + python-frontend = buildPythonPackage { + inherit name meta src; + + sourceRoot = "${name}/management/python"; + + propagatedBuildInputs = [ qpid-python ]; }; +in buildEnv { + name = "${name}-env"; + paths = [ qpid-cpp python-frontend ]; } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index ba29bfa433a9..94bd92abb4f8 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -48,7 +48,7 @@ in }; bird2 = generic { - version = "2.0.1"; - sha256 = "0qyh2cxj7hfz90x3fnczjdm3i9g7vr0nc4l4wjkj9qm0646vc52n"; + version = "2.0.2"; + sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3"; }; } diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index ad8aeadeff06..d89e59d662e7 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.11"; + version = "0.10.12"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "04ls0s79dsyxnrpra55qvl0dk9nyvps59l034326r3bzk4jhb3q6"; + sha256 = "0vmgswln72qqay73z39qn135sl5k71zlybr2jdrcjlmp4i7hrf88"; }; buildFlagsArray = '' diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 5c396a4a5036..dd076606da5b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.32"; + version = "2.4.33"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0adrca77awvf6vbq8943b1z25abqz6g8rk6zc8wm7y6w2mfd2lv3"; + sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 3b875576529f..bc67e7eaf430 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala"; + sha256 = "072pk0x1iyg6kasjah8qpki2z462qp0rvgn93y6ngi6zvrpdlbyc"; }; buildInputs = [ makeWrapper jre8 which gawk ]; |