Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6a3a05560a41
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2b2ff737829
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 17, 2019

  1. pythonPackages.rabbitpy: Fix build 

    (cherry picked from commit 2016b37)
ZHF: #56826
    @knedlsepp @worldofpeace
    knedlsepp authored and worldofpeace committed Mar 17, 2019
    Copy the full SHA
    0e6990d View commit details

  2. pythonPackages.rabbitypy: nitpicks 

    (cherry picked from commit d630716)
    @worldofpeace
    worldofpeace committed Mar 17, 2019
    Copy the full SHA
    b2b2ff7 View commit details
Showing with 21 additions and 5 deletions.
  1. +21 −5 pkgs/development/python-modules/rabbitpy/default.nix
26 changes: 21 additions & 5 deletions pkgs/development/python-modules/rabbitpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, mock
, nose
, pamqp
@@ -10,13 +10,29 @@ buildPythonPackage rec {
version = "1.0.0";
pname = "rabbitpy";

src = fetchPypi {
inherit pname version;
sha256 = "54d33746d0c6a686417cd354346803945df0740b39fb92842d259387100db126";
# No tests in the pypi tarball, so we directly fetch from git
src = fetchFromGitHub {
owner = "gmr";
repo = pname;
rev = version;
sha256 = "0fd80zlr4p2sh77rxyyfi9l0h2zqi2csgadr0rhnpgpqsy10qck6";
};

buildInputs = [ mock nose ];
propagatedBuildInputs = [ pamqp ];
checkInputs = [ mock nose ];

checkPhase = ''
runHook preCheck
rm tests/integration_tests.py # Impure tests requiring network
nosetests tests
runHook postCheck
'';

postPatch = ''
# See: https://github.com/gmr/rabbitpy/issues/118
substituteInPlace setup.py \
--replace 'pamqp>=1.6.1,<2.0' 'pamqp'
'';

meta = with stdenv.lib; {
description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library";