From 1fb466c28c9cc119776c0263bf9fa01ed9c7d104 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Wed, 29 Jun 2016 13:31:28 -0500 Subject: [PATCH] python bcrypt: use a git snapshot of bcrypt to get test suite, propagate cffi --- pkgs/top-level/python-packages.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 784677144203..17c96374b377 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4272,14 +4272,16 @@ in modules // { }; bcrypt = buildPythonPackage rec { - name = "bcrypt-2.0.0"; + name = "bcrypt-${version}"; + version = "2.0.0"; src = pkgs.fetchurl { - url = "mirror://pypi/b/bcrypt/${name}.tar.gz"; - sha256 = "8b2d197ef220d10eb74625dde7af3b10daa973ae9a1eadd6366f763fad4387fa"; + url = "https://api.github.com/repos/pyca/bcrypt/tarball/${version}"; + name = "bcrypt-${version}.tar.gz"; + sha256 = "14i1yp4qkjklx82jl61cjjcw367lc0pkvnix3gaz451ijdcmz3x8"; }; - - buildInputs = with self; [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ]; + buildInputs = with self; [ pycparser mock pytest py ]; + propagatedBuildInputs = with self; optional (!isPyPy) cffi; meta = { maintainers = with maintainers; [ domenkozar ]; @@ -13064,7 +13066,7 @@ in modules // { disabled = !isPy27; propagatedBuildInputs = with self; [ numpy matplotlib scipy ]; - + meta = { description = "Interfaces and utilities for the NEURON simulator and analysis of neural data"; maintainers = [ maintainers.nico202 ]; @@ -27542,7 +27544,7 @@ in modules // { }; propagatedBuildInputs = with self; [ - numpy + numpy Theano ];