From f84eb11a8af81471c0f65b17c190b0fc7508f350 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 09:40:26 -0700 Subject: bird2: 2.0.1 -> 2.0.2 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/bird/versions. These checks were done: - built on NixOS - ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird -h` got 0 exit code - ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird --help` got 0 exit code - ran `/nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2/bin/bird --version` and found version 2.0.2 - found 2.0.2 with grep in /nix/store/b6040kgjb2ndh4sznwnd30inslcf0ngi-bird-2.0.2 - directory tree listing: https://gist.github.com/b5a31c5299059545befb8209b15fef9d --- pkgs/servers/bird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') 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"; }; } -- cgit 1.4.1 From 0f5427195ffb4c99aa496af85f560f869a7e5622 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Mar 2018 18:30:36 -0700 Subject: neo4j: 3.3.2 -> 3.3.4 Semi-automatic update generated by https://github.com/ryantm/nix-update tools. This update was made based on information from https://repology.org/metapackage/neo4j/versions. These checks were done: - built on NixOS - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j help` got 0 exit code - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j --version` and found version 3.3.4 - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j version` and found version 3.3.4 - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j help` and found version 3.3.4 - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-admin help` got 0 exit code - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-admin --version` and found version 3.3.4 - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-import --help` got 0 exit code - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-import help` got 0 exit code - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell -h` got 0 exit code - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell --help` got 0 exit code - ran `/nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4/bin/neo4j-shell --version` and found version 3.3.4 - found 3.3.4 with grep in /nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4 - found 3.3.4 in filename of file in /nix/store/32bqjcjflqrpn65r5fw0si7hd5ps826s-neo4j-3.3.4 - directory tree listing: https://gist.github.com/06dd1dc492c20ed7b979e977cbfed538 --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') 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 ]; -- cgit 1.4.1 From 737bf1d22902f8f0039d7e89cdaa648eee755013 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 27 Mar 2018 14:39:56 +0200 Subject: apacheHttpd: 2.4.29 -> 2.4.33 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 41e65b588e16..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.29"; + version = "2.4.33"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00"; + sha256 = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05"; }; # FIXME: -dev depends on -doc -- cgit 1.4.1 From b71ffc1b25b46297f1e52fd0c0ac491d296160f2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Mar 2018 23:56:45 +0100 Subject: qpid-cpp: fix build The compilation broke due to the flag `-Werror=int-in-bool-context` which caused several compilation errors with GCC v7. Disabling this warning manually with `-Wno-error` in `NIX_CFLAGS_COMPILE` should be fine. This package experienced several radical changes as the entire python build in `$src/management/python` was broken since the given Python interpreter missed several needed modules (including `pythonPackages.qpid-python`). As the CMake build tried to invoke the affected `setup.py` manually and patched the shebangs with `disutil` and caused non-functional executables, I split the package up into two parts, the actual `qpid-cpp` lib and the Python module that will be composed using `buildEnv`. Furthermore I added myself as maintainer for the package as the diff became quite huge and we should have more folks available to maintain this. See https://hydra.nixos.org/build/71519082/log See tickets #36453 and #31747 --- pkgs/servers/amqp/qpid-cpp/default.nix | 56 +++++++++++++++++++++++----------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 39 insertions(+), 18 deletions(-) (limited to 'pkgs/servers') 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b4215a31ff4..be6957c7a572 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12716,6 +12716,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; + inherit (pythonPackages) buildPythonPackage qpid-python; }; quagga = callPackage ../servers/quagga { }; -- cgit 1.4.1 From a8375e40561e027939cd6892ee71e9d6da0b388b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 27 Mar 2018 16:33:37 +0200 Subject: caddy: 0.10.11 -> 0.10.12 --- pkgs/servers/caddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') 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 = '' -- cgit 1.4.1