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: 796c73631899
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1857e03ed479
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 7, 2018

  1. pythonPackages.locustio: 0.8.1 -> 0.9.0 (#46191)

    Fixing build issue. Additionally fetching from github becuase pypi
    packge does not come with README which is a buildtime dependency.
    
    (cherry picked from commit b5b48c0)
    costrouc authored and xeji committed Sep 7, 2018
    Copy the full SHA
    1857e03 View commit details
Showing with 9 additions and 11 deletions.
  1. +9 −11 pkgs/development/python-modules/locustio/default.nix
20 changes: 9 additions & 11 deletions pkgs/development/python-modules/locustio/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ buildPythonPackage
, fetchPypi
, fetchFromGitHub
, mock
, unittest2
, msgpack-python
, msgpack
, requests
, flask
, gevent
@@ -11,18 +11,16 @@

buildPythonPackage rec {
pname = "locustio";
version = "0.8.1";
version = "0.9.0";

src = fetchPypi {
inherit pname version;
sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61";
src = fetchFromGitHub {
owner = "locustio";
repo = "locust";
rev = "${version}";
sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
};

patchPhase = ''
sed -i s/"pyzmq=="/"pyzmq>="/ setup.py
'';

propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ];
propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
buildInputs = [ mock unittest2 ];

meta = {