diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-29 13:08:11 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-29 13:08:11 +0200 |
commit | b2608b891062dcc95e50f00c304b297a727adf97 (patch) | |
tree | 8b5c8773a75724455e3b67cb563ea84b0f9ec5e5 /pkgs/top-level | |
parent | 55357de67a2acfb11ba1a3633454c20acc9b54e7 (diff) | |
parent | 140f47eb748f9b24a77fa40a1f1ffd2376a24b81 (diff) | |
download | nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.gz nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.bz2 nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.lz nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.xz nixlib-b2608b891062dcc95e50f00c304b297a727adf97.tar.zst nixlib-b2608b891062dcc95e50f00c304b297a727adf97.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 149 |
2 files changed, 7 insertions, 145 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9bab9b947ff..21daf608d25d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6412,6 +6412,7 @@ with pkgs; bundix = callPackage ../development/ruby-modules/bundix { }; bundler = callPackage ../development/ruby-modules/bundler { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; + bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; inherit (callPackage ../development/interpreters/ruby {}) ruby_2_0_0 @@ -6727,6 +6728,8 @@ with pkgs; cookiecutter = pythonPackages.cookiecutter; + corundum = callPackage ../development/tools/corundum { }; + ctags = callPackage ../development/tools/misc/ctags { }; ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48ced46476f9..54a475ad1cbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1867,33 +1867,7 @@ in { }; }; - cycler = buildPythonPackage rec { - name = "cycler-${version}"; - version = "0.10.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/Cycler/${name}.tar.gz"; - sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"; - }; - - buildInputs = with self; [ coverage nose ]; - propagatedBuildInputs = with self; [ six ]; - - checkPhase = '' - ${python.interpreter} run_tests.py - ''; - - # Tests were not included in release. - # https://github.com/matplotlib/cycler/issues/31 - doCheck = false; - - meta = { - description = "Composable style cycles"; - homepage = http://github.com/matplotlib/cycler; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + cycler = callPackage ../development/python-modules/cycler { }; datadog = buildPythonPackage rec { name = "${pname}-${version}"; @@ -2137,55 +2111,7 @@ in { }; }; - blaze = buildPythonPackage rec { - name = "blaze-${version}"; - version = "0.11.0"; - - src = pkgs.fetchurl { - url = "https://github.com/blaze/blaze/archive/${version}.tar.gz"; - sha256 = "07zrrxkmdqk84xvdmp29859zcfzlpx5pz6g62l28nqp6n6a7yq9a"; - }; - - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ - contextlib2 - cytoolz - dask - datashape - flask - flask-cors - h5py - multipledispatch - numba - numpy - odo - pandas - psutil - pymongo - pyyaml - requests - sqlalchemy - tables - toolz - ]; - - # Failing test - # ERROR collecting blaze/tests/test_interactive.py - # E networkx.exception.NetworkXNoPath: node <class 'list'> not - # reachable from <class 'dask.array.core.Array'> - doCheck = false; - - checkPhase = '' - py.test blaze/tests - ''; - - meta = { - homepage = https://github.com/ContinuumIO/blaze; - description = "Allows Python users a familiar interface to query data living in other data storage systems"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ fridh ]; - }; - }; + blaze = callPackage ../development/python-modules/blaze { }; # Needed for FlexGet 1.2.337 and calibre 2.76.0 html5lib_0_9999999 = self.html5lib.override rec { @@ -3586,50 +3512,7 @@ in { }; }; - cython = buildPythonPackage rec { - name = "Cython-${version}"; - version = "0.25.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/C/Cython/${name}.tar.gz"; - sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"; - }; - - # With Python 2.x on i686-linux or 32-bit ARM this test fails because the - # result is "3L" instead of "3", so let's fix it in-place. - # - # Upstream issue: https://github.com/cython/cython/issues/1548 - postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) '' - sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ - tests/run/cpdef_enums.pyx - ''; - - buildInputs = with self; [ pkgs.glibcLocales pkgs.pkgconfig pkgs.gdb ]; - # For testing - nativeBuildInputs = with self; [ numpy pkgs.ncurses ]; - - LC_ALL = "en_US.UTF-8"; - - # cython's testsuite is not working very well with libc++ - # We are however optimistic about things outside of testsuite still working - checkPhase = '' - export HOME="$NIX_BUILD_TOP" - ${python.interpreter} runtests.py \ - ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""} - ''; - - # Disable tests temporarily - # https://github.com/cython/cython/issues/1676 - doCheck = false; - - meta = { - description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; - platforms = platforms.all; - homepage = http://cython.org; - license = licenses.asl20; - maintainers = with maintainers; [ fridh ]; - }; - }; + cython = callPackage ../development/python-modules/Cython { }; cytoolz = buildPythonPackage rec { name = "cytoolz-${version}"; @@ -21793,31 +21676,7 @@ in { }; }; - sounddevice = buildPythonPackage rec { - name = "sounddevice-${version}"; - version = "0.3.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sounddevice/${name}.tar.gz"; - sha256 = "4ef39be2d13069fbad8c69ac259e018d96ce55c23b529a7e0be9bd9a76e2e8da"; - }; - - propagatedBuildInputs = with self; [ cffi numpy pkgs.portaudio ]; - - # No tests included nor upstream available. - doCheck = false; - - prePatch = '' - substituteInPlace sounddevice.py --replace "'portaudio'" "'${pkgs.portaudio}/lib/libportaudio.so.2'" - ''; - - meta = { - description = "Play and Record Sound with Python"; - homepage = http://python-sounddevice.rtfd.org/; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fridh ]; - }; - }; + sounddevice = callPackage ../development/python-modules/sounddevice { }; stevedore = callPackage ../development/python-modules/stevedore {}; |