cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #169816 from armeenm/qpid-cpp-python3

Browse source 
qpid-cpp: switch to python3
This commit is contained in:
davidak 2022-05-09 09:33:16 +02:00 committed by GitHub
commit 2df966594a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
pkgs/servers/amqp/qpid-cpp/default.nix
View file

@ -1,15 +1,47 @@
{ lib, stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
{ lib, stdenv
, fetchpatch
, fetchurl
, boost
, cmake
, libuuid
, python3
, ruby
}:
let
stdenv.mkDerivation rec {
pname = "qpid-cpp";
name = "${pname}-${version}";
version = "1.39.0";
src = fetchurl {
url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
sha256 = "088dx1l6myrksbhpr15bs09j6qm8vdliqwjp2ja5amym47md103r";
url = "mirror://apache/qpid/cpp/${version}/${pname}-${version}.tar.gz";
hash = "sha256-eYDQ6iHVV1WUFFdyHGnbqGIjE9CrhHzh0jP7amjoDSE=";
};
nativeBuildInputs = [ cmake python3 ];
buildInputs = [ boost libuuid ruby ];
patches = [
(fetchpatch {
name = "python3-managementgen";
url = "https://github.com/apache/qpid-cpp/commit/0e558866e90ef3d5becbd2f6d5630a6a6dc43a5d.patch";
hash = "sha256-pV6xx8Nrys/ZxIO0Z/fARH0ELqcSdTXLPsVXYUd3f70=";
})
];
# 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 = toString ([
"-Wno-error=maybe-uninitialized"
] ++ lib.optionals stdenv.cc.isGNU [
"-Wno-error=deprecated-copy"
]);
meta = with lib; {
homepage = "https://qpid.apache.org";
description = "An AMQP message broker and a C++ messaging API";
@ -17,41 +49,4 @@ let
platforms = platforms.linux;
maintainers = with maintainers; [ cpages ];
};
qpid-cpp = stdenv.mkDerivation {
inherit src meta pname version;
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 = toString ([
"-Wno-error=deprecated-declarations"
"-Wno-error=int-in-bool-context"
"-Wno-error=maybe-uninitialized"
"-Wno-error=unused-function"
"-Wno-error=ignored-qualifiers"
"-Wno-error=catch-value"
] ++ lib.optionals stdenv.cc.isGNU [
"-Wno-error=deprecated-copy"
]);
};
python-frontend = buildPythonPackage {
inherit pname version meta src;
sourceRoot = "${name}/management/python";
propagatedBuildInputs = [ qpid-python ];
};
in buildEnv {
name = "${name}-env";
paths = [ qpid-cpp python-frontend ];
}

5
pkgs/top-level/all-packages.nix
View file

@ -22456,10 +22456,7 @@ with pkgs;
pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { };
qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
boost = boost155;
inherit (python2Packages) buildPythonPackage qpid-python;
};
qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { };