Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
@@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, gym
|
||||
, scipy
|
||||
@@ -17,18 +17,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "baselines";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6"; # remember to manually adjust the rev
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "baselines";
|
||||
# Unfortunately releases are not tagged. This commit bumps the version in setup.py
|
||||
rev = "2bca7901f51c88cdef3ca0666c6a87c454a4dbe8";
|
||||
sha256 = "0j2ck7rsrcyny9qbmrw9aqvzfhv70nbign8iva2dsisa2x24gbcl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# already fixed upstream
|
||||
./fix-dep-names.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gym
|
||||
scipy
|
||||
@@ -43,6 +41,13 @@ buildPythonPackage rec {
|
||||
click
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Needed for the atari wrapper, but the gym-atari package is not supported
|
||||
# in nixos anyways. Since opencv-python is not currently packaged, we
|
||||
# disable it.
|
||||
sed -ie '/opencv-python/d' setup.py
|
||||
'';
|
||||
|
||||
# fails to create a daemon, probably because of sandboxing
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index bf8badc..570be20 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -10,11 +10,11 @@ setup(name='baselines',
|
||||
packages=[package for package in find_packages()
|
||||
if package.startswith('baselines')],
|
||||
install_requires=[
|
||||
- 'gym[mujoco,atari,classic_control,robotics]',
|
||||
+ 'gym',
|
||||
'scipy',
|
||||
'tqdm',
|
||||
'joblib',
|
||||
- 'zmq',
|
||||
+ 'pyzmq',
|
||||
'dill',
|
||||
'progressbar2',
|
||||
'mpi4py',
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "braintree";
|
||||
version = "3.54.0";
|
||||
version = "3.55.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09dbj04r55hnm8zvfz8wbnxkxb1pfy7g43pzcgs4hhh5xh45ppfd";
|
||||
sha256 = "0l3i0ayzykrsraqf87z4h39qm3kxyfwrm09n81gnkvsn2126izsd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Chameleon";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "850f74f756bcb99423dd2658b99f448b09f09ccc2c60c0a2d6dec52294d7f9ed";
|
||||
sha256 = "0aw6cqnychmsxjjgihwr7df92xw6ac1wr4x70mvq28z3iq35x7ls";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cherrypy";
|
||||
version = "18.1.1";
|
||||
version = "18.1.2";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "CherryPy";
|
||||
inherit version;
|
||||
sha256 = "6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b";
|
||||
sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "cmd2";
|
||||
version = "0.9.13";
|
||||
version = "0.9.14";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b873ade57ebf6c42a9d4e8c705fc2b16777e9d2e53fec5b113914dc65f2eae38";
|
||||
sha256 = "0rllwc4h89xdivy85nmgqdi2s0sk1zw31mlvrnlr9gz2902cnq93";
|
||||
};
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pname = "confluent-kafka";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a7427944af963410479c2aaae27cc9d28db39c9a93299f14dcf16df80092c63a";
|
||||
sha256 = "04bsnyhldcvscdj0dg3hm5k27vmhfi9k6bwz963sd3q2h7g9k6kg";
|
||||
};
|
||||
|
||||
buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ;
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datadog";
|
||||
version = "0.26.0";
|
||||
version = "0.29.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79";
|
||||
sha256 = "0p47hy1p2hf233blalyz0yr6nf13iwk9ndkqdk428dmf8b8m2plr";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, django
|
||||
, mock
|
||||
, isort
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -14,7 +18,14 @@ buildPythonPackage rec {
|
||||
sha256 = "a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [ isort django ];
|
||||
|
||||
checkInputs = [ mock ];
|
||||
checkPhase = ''
|
||||
# prove we're running tests against installed package, not build dir
|
||||
rm -r taggit
|
||||
${python.interpreter} -m django test --settings=tests.settings
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "django-taggit is a reusable Django application for simple tagging";
|
||||
|
||||
@@ -11,10 +11,11 @@
|
||||
, wrapt
|
||||
, tensorflow
|
||||
, tensorflow-probability
|
||||
, tensorflow-estimator
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.30";
|
||||
version = "1.33";
|
||||
|
||||
# first build all binaries and generate setup.py using bazel
|
||||
bazel-build = buildBazelPackage rec {
|
||||
@@ -24,7 +25,7 @@ let
|
||||
owner = "deepmind";
|
||||
repo = "sonnet";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dli4a4arx2gmb4p676pfibvnpag9f13znisrk9381g7xpqqmaw6";
|
||||
sha256 = "1nqsja1s8jrkq6v1whgh7smk17313mjr9vs3k5c1m8px4yblzhqc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,9 +36,14 @@ let
|
||||
bazelTarget = ":install";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "0q7mz69nzng8i6pn3h0va79q4nh60jfjjj9crric8g6dmdwc3h1i";
|
||||
sha256 = "0f2rlzrlazmgjrsin8vq3jfv431cc8sx8lxsr6x4wgd4jx5d1zzy";
|
||||
};
|
||||
|
||||
bazelFlags = [
|
||||
# https://github.com/deepmind/sonnet/issues/134
|
||||
"--incompatible_disable_deprecated_attr_params=false"
|
||||
];
|
||||
|
||||
buildAttrs = {
|
||||
preBuild = ''
|
||||
patchShebangs .
|
||||
@@ -68,6 +74,7 @@ in buildPythonPackage rec {
|
||||
wrapt
|
||||
tensorflow
|
||||
tensorflow-probability
|
||||
tensorflow-estimator
|
||||
];
|
||||
|
||||
# not sure how to properly run the real test suite -- through bazel?
|
||||
|
||||
@@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3";
|
||||
sha256 = "1lvj8z6fikpb5r4rq9n53x3lmsm3vlbr58ikz28x85kly633fakm";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
26
pkgs/development/python-modules/google-pasta/default.nix
Normal file
26
pkgs/development/python-modules/google-pasta/default.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-pasta";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zmqfvy28i2509277s6sz098kddd16cx21vpxyc8xml1nclcxlbr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "An AST-based Python refactoring library";
|
||||
homepage = https://github.com/google/pasta;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ timokau ];
|
||||
};
|
||||
}
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libversion";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ax1bq5hrbs2pq2krya83yj1s5cm33pcpwalnc15cgj73kmhb5fn";
|
||||
sha256 = "0xp0wv4s1537s0iqa1ih3kfh1p70s7d1fkwhvrnbj8m98yjij84q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libvirt";
|
||||
version = "4.10.0";
|
||||
version = "5.4.0";
|
||||
|
||||
src = assert version == libvirt.version; fetchgit {
|
||||
url = git://libvirt.org/libvirt-python.git;
|
||||
rev = "v${version}";
|
||||
sha256 = "184gd857fkks9ivh4zzbmva2fs2dfxg9lihvhfrwyd2pxflglvyf";
|
||||
sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "luftdaten";
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c";
|
||||
sha256 = "0jxp9yfabdgn2d6w69ijrw1bk1d9g897425cyybiyc13zhhs0kwg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp async-timeout ];
|
||||
|
||||
@@ -1,24 +1,18 @@
|
||||
{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
|
||||
{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mpi4py";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5";
|
||||
sha256 = "1q28xl36difma1wq0acq111cqxjya32kn3lxp6fbidz3wg8jkmpq";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit mpi;
|
||||
};
|
||||
|
||||
patches = [ ( fetchpatch {
|
||||
# Upstream patch to ensure compatibility with openmpi-4.0.1
|
||||
url = "https://github.com/mpi4py/mpi4py/commit/42f5e35a6a90454516c11131549a08cd766edbb0.patch";
|
||||
sha256 = "1dm0i3amwj1cddzz1m9ssd7qp655c8rv1wzjs9ww3kzd90fm4w72";
|
||||
})];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace test/test_spawn.py --replace \
|
||||
"unittest.skipMPI('openmpi(<3.0.0)')" \
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first
|
||||
{ stdenv, fetchPypi, buildPythonPackage, pip, pytest, click, six, first
|
||||
, setuptools_scm, git, glibcLocales, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "3.3.2";
|
||||
name = pname + "-" + version;
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
|
||||
sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1vwh3hx4jrzf51yj9h31nk9ji53lqaq63mlqd7n84hcmfwy3rwz4";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
@@ -17,13 +16,22 @@ buildPythonPackage rec {
|
||||
|
||||
disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) [
|
||||
# Depend on network tests:
|
||||
"test_allow_unsafe_option" #paramaterized, but all fail
|
||||
"test_annotate_option" #paramaterized, but all fail
|
||||
"test_editable_package_vcs"
|
||||
"test_generate_hashes_all_platforms"
|
||||
"test_generate_hashes_without_interfering_with_each_other"
|
||||
"test_realistic_complex_sub_dependencies"
|
||||
"test_generate_hashes_with_editable"
|
||||
"test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore
|
||||
"test_filter_pip_markers"
|
||||
"test_filter_pip_markes"
|
||||
"test_generate_hashes_all_platforms"
|
||||
"test_generate_hashes_verbose"
|
||||
"test_generate_hashes_with_editable"
|
||||
"test_generate_hashes_with_url"
|
||||
"test_generate_hashes_without_interfering_with_each_other"
|
||||
"test_get_hashes_local_repository_cache_miss"
|
||||
"test_realistic_complex_sub_dependencies"
|
||||
"test_stdin"
|
||||
"test_upgrade_packages_option"
|
||||
"test_url_package"
|
||||
# Expect specific version of "six":
|
||||
"test_editable_package"
|
||||
"test_input_file_without_extension"
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytesseract";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0w4phjw0gn52hqlm3ixs2cmj25x7y7nk6ijr9f82wvjvb4hh7hhi";
|
||||
sha256 = "0vyv6wnch1l5kcxqzngakx948qz90q604bl5h93x54381lq3ndj6";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-django";
|
||||
version = "3.4.8";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1vj2xfb6jl570zmmwlhvfpj7af5q554z72z51ril07gyfkkq6cjd";
|
||||
sha256 = "1fynkswykgnqn8wqibavf598md5p005ilcac6sk4hpfv0v2v8kr6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest setuptools_scm ];
|
||||
|
||||
@@ -1,15 +1,28 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, click, ipython }:
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, click
|
||||
, ipython
|
||||
, pytest
|
||||
, sh
|
||||
, typing
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-dotenv";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6640acd76e6cab84648e4fec16c9d19de6700971f9d91d045e7120622167bfda";
|
||||
sha256 = "0i25gh8wi87l4g0iflp81rlgmps4cdmp90hwypalp7gcbwfxfmzi";
|
||||
};
|
||||
|
||||
checkInputs = [ click ipython ];
|
||||
propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];
|
||||
|
||||
checkInputs = [ ipython pytest sh ];
|
||||
|
||||
# cli tests are impure
|
||||
checkPhase = ''
|
||||
pytest tests/ -k 'not cli'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Add .env support to your django/flask apps in development and deployments";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "QtPy";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "17pdn4d77gjjrsq7m1i6dz9px0dfi6wgaqz2v3sa3crl15spawp9";
|
||||
sha256 = "14hws3zc2d548bfkxk1j2xy4ll368rak3z16bz3pdlj9j259jrpb";
|
||||
};
|
||||
|
||||
# no concrete propagatedBuildInputs as multiple backends are supposed
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, betamax
|
||||
, mock
|
||||
, pytest
|
||||
, pyopenssl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -16,7 +17,7 @@ buildPythonPackage rec {
|
||||
sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";
|
||||
};
|
||||
|
||||
checkInputs = [ betamax mock pytest ];
|
||||
checkInputs = [ pyopenssl betamax mock pytest ];
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.2.0";
|
||||
version = "3.3.1";
|
||||
pname = "robotframework-seleniumlibrary";
|
||||
|
||||
# no tests included in PyPI tarball
|
||||
@@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||
owner = "robotframework";
|
||||
repo = "SeleniumLibrary";
|
||||
rev = "v${version}";
|
||||
sha256 = "106dl0qgf52wqk1xn4ghj7n2fjhaq0fh2wlnqn29aczbv5q581y3";
|
||||
sha256 = "0dabc5dwx0pwsyiy74d7wj97k72yl28a17sasjzrdq819pyc3dvq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ robotframework selenium ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sabyenc";
|
||||
version = "3.3.5";
|
||||
version = "3.3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fpvd5mckf1kbn0bhc5ybm08y41ps7sc5f9khz08qyjbikbcww85";
|
||||
sha256 = "1qbymi1626mmcxnsqdwnz2krxg7jvl4qbh8nwjj54z2p681wvjm4";
|
||||
};
|
||||
|
||||
# tests are not included in pypi distribution
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snakeviz";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0hvfc7c25cz6p3m3p3klm3njiysp7lkrs9sxm4p40spldl0jlfpa";
|
||||
sha256 = "11a8cd4g98vq2x61i99ncl5w83clnndwg909ya4y1cdf0k1ckb40";
|
||||
};
|
||||
|
||||
# Upstream doesn't run tests from setup.py
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "statsmodels";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6461f93a842c649922c2c9a9bc9d9c4834110b89de8c4af196a791ab8f42ba3b";
|
||||
sha256 = "1fhsq3bz5ya54ipa0cb8qgfj7gfgxprv4briig0ly4r11rj23wv5";
|
||||
};
|
||||
|
||||
checkInputs = with self; [ nose ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-estimator";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "tensorflow_estimator";
|
||||
inherit version format;
|
||||
sha256 = "068l4w0w7dj9gqkf8avjclq9zsp7ifwzw4rpf4qjylz3hczamzbw";
|
||||
sha256 = "14irpsyj14vn2dpwr601f54058wywci1pv0hss8s01rl0rk3y1ya";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mock numpy absl-py ];
|
||||
|
||||
@@ -1,35 +1,104 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildBazelPackage
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, setuptools
|
||||
, wheel
|
||||
, tensorflow
|
||||
, six
|
||||
, numpy
|
||||
, decorator
|
||||
, cloudpickle
|
||||
, hypothesis
|
||||
, scipy
|
||||
, matplotlib
|
||||
, mock
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-probability";
|
||||
version = "0.6.0";
|
||||
let
|
||||
version = "0.7";
|
||||
pname = "tensorflow_probability";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "probability";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y210n4asv8j39pk68bdfrz01gddflvzhxbcvj5jw6rjgaagnhvx";
|
||||
# first build all binaries and generate setup.py using bazel
|
||||
bazel-wheel = buildBazelPackage {
|
||||
name = "${pname}-${version}-py2.py3-none-any.whl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "probability";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
# needed to create the output wheel in installPhase
|
||||
python
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
bazelTarget = ":pip_pkg";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
preBuild = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# work around timestamp issues
|
||||
# https://github.com/NixOS/nixpkgs/issues/270#issuecomment-467583872
|
||||
export SOURCE_DATE_EPOCH=315532800
|
||||
|
||||
# First build, then move. Otherwise pip_pkg would create the dir $out
|
||||
# and then put the wheel in that directory. However we want $out to
|
||||
# point directly to the wheel file.
|
||||
./bazel-bin/pip_pkg . --release
|
||||
mv *.whl "$out"
|
||||
'';
|
||||
};
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
inherit version pname;
|
||||
format = "wheel";
|
||||
|
||||
src = bazel-wheel;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tensorflow
|
||||
six
|
||||
numpy
|
||||
decorator
|
||||
cloudpickle
|
||||
];
|
||||
|
||||
# Listed here:
|
||||
# https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytest
|
||||
scipy
|
||||
matplotlib
|
||||
mock
|
||||
];
|
||||
|
||||
# Tests have an invalid import (`tensorflow_probability.opensource`), should
|
||||
# be resolved in the next version with
|
||||
# https://github.com/tensorflow/probability/commit/77d5957f2f0bdddcb46582799cd9c5c5167a1a40
|
||||
doCheck = false;
|
||||
# actual checks currently fail because for some reason
|
||||
# tf.enable_eager_execution is called too late. Probably because upstream
|
||||
# intents these tests to be run by bazel, not plain pytest.
|
||||
# checkPhase = ''
|
||||
# # tests need to import from other test files
|
||||
# export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH"
|
||||
# py.test
|
||||
# '';
|
||||
|
||||
# sanity check
|
||||
checkPhase = ''
|
||||
py.test
|
||||
python -c 'import tensorflow_probability'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-tensorboard";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi ({
|
||||
@@ -23,10 +23,10 @@ buildPythonPackage rec {
|
||||
format = "wheel";
|
||||
} // (if isPy3k then {
|
||||
python = "py3";
|
||||
sha256 = "19ixs811ndx8qh72dif0ywjss3rv7pf1khsgg6rvfjb9nw8wgjc2";
|
||||
sha256 = "1z631614jk5zgasgmwfr33gz8bwv11p9f5llzlwvx3a8rnyv3q2h";
|
||||
} else {
|
||||
python = "py2";
|
||||
sha256 = "0qpv6jsf6jjvdl95qvarn006kfj5a99mq925d73xg4af50ssvkrf";
|
||||
sha256 = "1clv29yy942l3mfar2z6wkkk6l18fz7j6mi2dfz24j9dln0scny3";
|
||||
}));
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
, isPy3k, pythonOlder
|
||||
, astor
|
||||
, gast
|
||||
, google-pasta
|
||||
, wrapt
|
||||
, numpy
|
||||
, six
|
||||
, termcolor
|
||||
@@ -41,7 +43,7 @@ let
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "tensorflow";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
format = "wheel";
|
||||
|
||||
src = let
|
||||
@@ -53,9 +55,23 @@ in buildPythonPackage rec {
|
||||
dls = import (./. + "/tf${version}-hashes.nix");
|
||||
in fetchurl dls.${key};
|
||||
|
||||
propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-estimator tensorflow-tensorboard keras-applications keras-preprocessing ]
|
||||
++ lib.optional (!isPy3k) mock
|
||||
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
|
||||
propagatedBuildInputs = [
|
||||
protobuf
|
||||
numpy
|
||||
termcolor
|
||||
grpcio
|
||||
six
|
||||
astor
|
||||
absl-py
|
||||
gast
|
||||
google-pasta
|
||||
wrapt
|
||||
tensorflow-estimator
|
||||
tensorflow-tensorboard
|
||||
keras-applications
|
||||
keras-preprocessing
|
||||
] ++ lib.optional (!isPy3k) mock
|
||||
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
|
||||
|
||||
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
|
||||
# and the propageted input tensorflow-tensorboard which causes environment collisions.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
version=1.13.1
|
||||
version=1.14.0
|
||||
hashfile=tf${version}-hashes.nix
|
||||
rm -f $hashfile
|
||||
echo "{" >> $hashfile
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
linux_py_27_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp27-none-linux_x86_64.whl";
|
||||
sha256 = "0y1vd3y5fxcjj5d35qbk8482b0s642nyp0c2sm068vx5wd4sjpcg";
|
||||
};
|
||||
linux_py_35_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp35-cp35m-linux_x86_64.whl";
|
||||
sha256 = "0b27swk4c2vaimwzbzl4c7xnccr9cfak5a3848lfqlcavcmbp94j";
|
||||
};
|
||||
linux_py_36_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp36-cp36m-linux_x86_64.whl";
|
||||
sha256 = "087jwjby3bym09z55cjhc587aasf01y6l009p1q2vcpfq7s7ljmk";
|
||||
};
|
||||
linux_py_37_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.13.1-cp37-cp37m-linux_x86_64.whl";
|
||||
sha256 = "0as68dp87lh7ffcccb149km6vws15ap04604irxwz35fq9h7grxg";
|
||||
};
|
||||
linux_py_27_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp27-none-linux_x86_64.whl";
|
||||
sha256 = "0bf239f2bnsbqs3qh4xdql9pgbsm0zk7j8q1hg0wn0wrq440n0ds";
|
||||
};
|
||||
linux_py_35_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp35-cp35m-linux_x86_64.whl";
|
||||
sha256 = "1cqav22a8yz6fzk46z6kv1ha2i28h5wccbd7k66drrfxibmb93j0";
|
||||
};
|
||||
linux_py_36_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp36-cp36m-linux_x86_64.whl";
|
||||
sha256 = "1xnbiz36z7nicqrv0cmymfnwb8mdz2hifcv71gh6gnyi1962f2d7";
|
||||
};
|
||||
linux_py_37_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.13.1-cp37-cp37m-linux_x86_64.whl";
|
||||
sha256 = "10gcrmd9y5a89wpi4rpp9scc9l2krijv8yjp7iphlykmn54ps74k";
|
||||
};
|
||||
mac_py_2_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py2-none-any.whl";
|
||||
sha256 = "1a6y5xj2wqkd8qmabn2xjg3q7x2jfixwrz351dgcxlhy8qy5yc0g";
|
||||
};
|
||||
mac_py_3_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.13.1-py3-none-any.whl";
|
||||
sha256 = "1klsv18k0isfd61z1wirfz1lnqmx8k73ga8g9s18yand65iycads";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
linux_py_27_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl";
|
||||
sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k";
|
||||
};
|
||||
linux_py_35_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl";
|
||||
sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj";
|
||||
};
|
||||
linux_py_36_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl";
|
||||
sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44";
|
||||
};
|
||||
linux_py_37_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl";
|
||||
sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5";
|
||||
};
|
||||
linux_py_27_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl";
|
||||
sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5";
|
||||
};
|
||||
linux_py_35_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl";
|
||||
sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx";
|
||||
};
|
||||
linux_py_36_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl";
|
||||
sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd";
|
||||
};
|
||||
linux_py_37_gpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl";
|
||||
sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2";
|
||||
};
|
||||
mac_py_2_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl";
|
||||
sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26";
|
||||
};
|
||||
mac_py_3_cpu = {
|
||||
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl";
|
||||
sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3";
|
||||
};
|
||||
}
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tomlkit";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hjfzlb6y694pkadygcaq1n63di97pxgq2zpc74in1axc5166l6n";
|
||||
sha256 = "1pby2lbzwy2pwdbq8xaqi4560b1ih5m0y141mmbc446j3w168fvv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "6.28.0";
|
||||
version = "6.29.0";
|
||||
# tests not included in PyPi, so fetch from github instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = version;
|
||||
sha256 = "161s4nb4hhqgb8kc5wiq3s4jkv9a3fg9vycf5ga804vzfr04zlki";
|
||||
sha256 = "1xsg862d68rdrl6m3v9zcq20h42jn6x9cv1bk2ydiizyn6ngqz8w";
|
||||
};
|
||||
|
||||
buildInputs = [ nose mock ];
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vega";
|
||||
version = "2.1.0";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0lshwsvi242m0ybrqjvbag73x1mrb31w2jq3lnklqyzry153xfdb";
|
||||
sha256 = "0f39kfinn297gjhms9jys3ixdlsn0dz3gndgacyimp77jhzir4v1";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyVirtualDisplay";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
propagatedBuildInputs = [ EasyProcess ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "658d03ea2d6727cbe70c30af71e9014d3d39114a3c50bd661b75aad188fdd3aa";
|
||||
sha256 = "0nybvd7sajig6vya2v3fd20dls6f3nnf12x8anrfxnjs41chgx87";
|
||||
};
|
||||
|
||||
# requires X server
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xarray";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ac09a819e791be208ae33fa7ecee19d0fe7b5479906f927d358a61957ce27e10";
|
||||
sha256 = "0wlpyzxdhcc043g9sjbrflky7xwdyq487v64i532zb2fpjskd59s";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamllint";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7";
|
||||
sha256 = "1bw39aiyqspjsxps5m3skaszih8vap8kyialbzg7jjc080nyqkws";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ZConfig";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998";
|
||||
sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
|
||||
|
||||
Reference in New Issue
Block a user