public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2020-03-04 21:24:05 +01:00
parent 62e09735d0 7399c59c41
commit 1a44e325d2
398 changed files with 11785 additions and 9553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/asdf/default.nix
View File

@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "asdf";
version = "2.5.0";
version = "2.5.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "1qddczr5vhlbhmzmw6bwmkrvsj8dml76zf9gnk22qzab60ali99j";
sha256 = "0ai5l62ldaq1cqfmq3hvnzp8gp0hjjmjnck9d3cnx5r8la5ig18y";
};
postPatch = ''
@@ -50,7 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python tools to handle ASDF files";
homepage = https://github.com/spacetelescope/asdf;
homepage = "https://github.com/spacetelescope/asdf";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};

9
pkgs/development/python-modules/astroquery/default.nix
View File

@@ -9,21 +9,26 @@
, pytest
, pytest-astropy
, astropy-helpers
, isPy3k
}:
buildPythonPackage rec {
pname = "astroquery";
version = "0.3.10";
version = "0.4";
src = fetchPypi {
inherit pname version;
sha256 = "1ce57a8792c7d5d74206d797d379de6da35d56be433ea5840c41a49f202e2fab";
sha256 = "1ddwnj9vpvxkrfb45c4pwv5f5za9kn2q0040dpw2ymj2bwlpl61h";
};
disabled = !isPy3k;
propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];
nativeBuildInputs = [ astropy-helpers ];
# Tests disabled until pytest-astropy has been updated to include pytest-astropy-header
doCheck = false;
checkInputs = [ pytest pytest-astropy ];
# Disable automatic update of the astropy-helper module

6
pkgs/development/python-modules/authlib/default.nix
View File

@@ -8,14 +8,14 @@
}:
buildPythonPackage rec {
version = "0.13";
version = "0.14.1";
pname = "authlib";
src = fetchFromGitHub {
owner = "lepture";
repo = "authlib";
rev = "v${version}";
sha256 = "1nv0jbsaqr9qjn7nnl55s42iyx655k7fsj8hs69652lqnfn5y3d5";
sha256 = "0z56r5s8z8pfp0p8zrf1chgzan4q25zg0awgc7bgkvkwgxbhzx4m";
};
propagatedBuildInputs = [ cryptography requests ];
@@ -27,7 +27,7 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
homepage = https://github.com/lepture/authlib;
homepage = "https://github.com/lepture/authlib";
description = "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included.";
maintainers = with maintainers; [ flokli ];
license = licenses.bsd3;

4
pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
View File

@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-keyvault";
version = "2.0.0";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "057ii54h8yr7rhfnbl0r29xbsg7mhf031hjffmdv0zf93552kmja";
sha256 = "0ga6lzqlinfxlzx1g35a5sv5chjx4im0m4b8i33hqrhmdv9m7ypg";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/bayesian-optimization/default.nix
View File

@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "bayesian-optimization";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "fmfn";
repo = "BayesianOptimization";
rev = "v${version}";
sha256 = "07sqymg6k5512k7wq4kbp7rsrkb4g90n0ck1f0b9s6glyfpcy4pq";
sha256 = "0ylip9xdi0cjzmdayxxpazdfaa9dl0sdcl2qsfn3p0cipj59bdvd";
};
propagatedBuildInputs = [

3
pkgs/development/python-modules/buildbot/default.nix
View File

@@ -3,7 +3,7 @@
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
parameterized, git, openssh, glibcLocales }:
parameterized, git, openssh, glibcLocales, nixosTests }:
let
withPlugins = plugins: buildPythonPackage {
@@ -91,6 +91,7 @@ let
passthru = {
inherit withPlugins;
tests.buildbot = nixosTests.buildbot;
};
meta = with lib; {

4
pkgs/development/python-modules/buildbot/pkg.nix
View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "buildbot-pkg";
version = "2.6.0";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z";
sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb";
};
postPatch = ''

14
pkgs/development/python-modules/buildbot/plugins.nix
View File

@@ -7,14 +7,12 @@
src = fetchPypi {
inherit pname version;
sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg";
sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi";
};
# Remove unneccessary circular dependency on buildbot
postPatch = ''
sed -i setup.py \
-e "/import buildbot/d" \
-e "s/'buildbot',//"
sed -i "s/'buildbot'//" setup.py
'';
buildInputs = [ buildbot-pkg mock ];
@@ -36,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10";
sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8";
};
buildInputs = [ buildbot-pkg ];
@@ -58,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb";
sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58";
};
buildInputs = [ buildbot-pkg ];
@@ -80,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh";
sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4";
};
buildInputs = [ buildbot-pkg ];
@@ -102,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r";
sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg";
};
buildInputs = [ buildbot-pkg ];

4
pkgs/development/python-modules/buildbot/worker.nix
View File

@@ -3,11 +3,11 @@
buildPythonPackage (rec {
pname = "buildbot-worker";
version = "2.6.0";
version = "2.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l";
sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6";
};
propagatedBuildInputs = [ twisted future ];

12
pkgs/development/python-modules/cocotb/default.nix
View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "cocotb";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "091q63jcm87xggqgqi44lw2vjxhl1v4yl0mv2c76hgavb29w4w5y";
sha256 = "0gwd79zm7196fhnbzbdpyvgzsfjfzl3pmc5hh27h7hckfpxzj9yw";
};
propagatedBuildInputs = [
@@ -24,10 +24,10 @@ buildPythonPackage rec {
cocotb/share/makefiles/simulators/Makefile.*
do
substituteInPlace $f --replace 'shell which' 'shell command -v'
# replace hardcoded gcc. Remove once https://github.com/cocotb/cocotb/pull/1137 gets merged
substituteInPlace $f --replace 'gcc' '$(CC)'
substituteInPlace $f --replace 'g++' '$(CXX)'
done
# This can probably be removed in the next update after 1.3.0
substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" ""
'';
checkInputs = [ swig verilog ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
homepage = https://github.com/cocotb/cocotb;
homepage = "https://github.com/cocotb/cocotb";
license = licenses.bsd3;
maintainers = with maintainers; [ matthuszagh ];
};

6
pkgs/development/python-modules/dash-core-components/default.nix
View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_core_components";
version = "1.7.0";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "16jjanq4glj6c2cwyw94954hrqqv49fknisbxj03lfmflg61j32k";
sha256 = "0qqf51mphv1pqqc2ff50rkbw44sp9liifg0mg7xkh41sgnv032cs";
};
# No tests in archive
@@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A dash component starter pack";
homepage = https://dash.plot.ly/dash-core-components;
homepage = "https://dash.plot.ly/dash-core-components";
license = licenses.mit;
maintainers = [ maintainers.antoinerg ];
};

6
pkgs/development/python-modules/dash-renderer/default.nix
View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_renderer";
version = "1.2.3";
version = "1.2.4";
src = fetchPypi {
inherit pname version;
sha256 = "1ccsykv24dz9xj24106aaj7f0w7x7sv7mamjbx0m6k0wyhh58vw1";
sha256 = "1w6mpmvfj6nv5rdzikwc7wwhrgscbh50d0azzydhsa9jccxvkakl";
};
# No tests in archive
@@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Renderer for the Dash framework";
homepage = https://dash.plot.ly/;
homepage = "https://dash.plot.ly/";
license = licenses.mit;
maintainers = [ maintainers.antoinerg ];
};

6
pkgs/development/python-modules/dash-table/default.nix
View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_table";
version = "4.6.0";
version = "4.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "01wzac09ac6nr27if1liaxafzdf67x00vw1iq5vaad1147rdh36k";
sha256 = "0xwwkp7zsmrcnl3fswm5f319cxk7hk4dzacvfsarll2b47rmm434";
};
# No tests in archive
@@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A First-Class Interactive DataTable for Dash";
homepage = https://dash.plot.ly/datatable;
homepage = "https://dash.plot.ly/datatable";
license = licenses.mit;
maintainers = [ maintainers.antoinerg ];
};

13
pkgs/development/python-modules/dash/default.nix
View File

@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "dash";
version = "1.8.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "plotly";
repo = pname;
rev = "v${version}";
sha256 = "11skbvjlj93aw1pqx6j56h73sy9r06jwq7z5h64fd1a3d4z2gsvy";
sha256 = "0lqvcq7xaw5l1mwmgfdhr9jspq8jzkxf77862k0ca4d9zglkqp4z";
};
propagatedBuildInputs = [
@@ -43,11 +43,8 @@ buildPythonPackage rec {
];
checkPhase = ''
pytest tests/unit/test_configs.py
pytest tests/unit/test_fingerprint.py
pytest tests/unit/test_import.py
pytest tests/unit/test_resources.py
pytest tests/unit/dash/
pytest tests/unit/test_{configs,fingerprint,import,resources}.py \
tests/unit/dash/
'';
pythonImportsCheck = [
@@ -56,7 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python framework for building analytical web applications";
homepage = https://dash.plot.ly/;
homepage = "https://dash.plot.ly/";
license = licenses.mit;
maintainers = [ maintainers.antoinerg ];
};

50
pkgs/development/python-modules/digitalocean/default.nix
View File

@@ -1,23 +1,53 @@
{ stdenv, buildPythonPackage, fetchPypi, requests, jsonpickle }:
{ buildPythonPackage
, fetchFromGitHub
, fetchPypi
, isPy3k
, jsonpickle
, mock
, pytest
, pytestCheckHook
, requests
, responses
, stdenv
}:
buildPythonPackage rec {
pname = "python-digitalocean";
version = "1.13.2";
version = "1.15.0";
src = fetchPypi {
inherit pname version;
sha256 = "0h4drpdsmk0b3rlvg6q6cz11k23w0swj1iddk7xdcw4m7r7c52kw";
src = fetchFromGitHub {
owner = "koalalorenzo";
repo = "python-digitalocean";
rev = "v${version}";
sha256 = "1pz15mh72i992p63grwzqn2bbp6sm37zcp4f0fy1z7rsargwsbcz";
};
propagatedBuildInputs = [ requests jsonpickle ];
propagatedBuildInputs = [
jsonpickle
requests
];
# Package doesn't distribute tests.
doCheck = false;
dontUseSetuptoolsCheck = true;
checkInputs = [
pytest
pytestCheckHook
responses
] ++ stdenv.lib.optionals (!isPy3k) [
mock
];
preCheck = ''
cd digitalocean
'';
meta = with stdenv.lib; {
description = "digitalocean.com API to manage Droplets and Images";
homepage = https://pypi.python.org/pypi/python-digitalocean;
homepage = "https://pypi.python.org/pypi/python-digitalocean";
license = licenses.lgpl3;
maintainers = with maintainers; [ teh ];
maintainers = with maintainers; [
kiwi
teh
];
};
}

2
pkgs/development/python-modules/dm-sonnet/default.nix
View File

@@ -36,7 +36,7 @@ let
bazelTarget = ":install";
fetchAttrs = {
sha256 = "0mxma7jajm42v1hv6agl909xra0azihj588032ivhlmmh403x6wg";
sha256 = "0wb2gh9ji8bgq4s9ci9x017dybxqzjhncpw33b1wjksm2yhbkvlz";
};
bazelFlags = [

67
pkgs/development/python-modules/glances/default.nix
View File

@@ -1,67 +0,0 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib
, psutil, setuptools, bottle, batinfo, pysnmp
, hddtemp, future
# Optional dependencies:
, netifaces # IP module
# Tests:
, unittest2
}:
buildPythonPackage rec {
pname = "glances";
version = "3.1.3";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch
++ [
(fetchpatch {
# Correct unitest
url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch";
sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1";
})
(fetchpatch {
# Fix IP plugin initialization issue
url = "https://github.com/nicolargo/glances/commit/48cb5ef8053d823302e7e53490fb22cec2fabb0f.patch";
sha256 = "1590qgcr8w3d9ddpgd9mk5j6q6aq29341vr8bi202yjwwiv2bia9";
})
];
# On Darwin this package segfaults due to mismatch of pure and impure
# CoreFoundation. This issues was solved for binaries but for interpreted
# scripts a workaround below is still required.
# Relevant: https://github.com/NixOS/nixpkgs/issues/24693
makeWrapperArgs = lib.optionals stdenv.isDarwin [
"--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks"
];
doCheck = true;
checkInputs = [ unittest2 ];
preCheck = lib.optional stdenv.isDarwin ''
export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
'';
propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp future
netifaces
] ++ lib.optional stdenv.isLinux hddtemp;
preConfigure = ''
sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py;
'';
meta = with lib; {
homepage = https://nicolargo.github.io/glances/;
description = "Cross-platform curses-based monitoring tool";
license = licenses.lgpl3;
maintainers = with maintainers; [ primeos koral ];
platforms = platforms.linux ++ platforms.darwin;
};
}

60
pkgs/development/python-modules/glances/skip-failing-tests.patch
View File

@@ -1,60 +0,0 @@
diff --git a/unitest.py b/unitest.py
--- a/unitest.py
+++ b/unitest.py
@@ -59,6 +59,7 @@ class TestGlances(unittest.TestCase):
"""The function is called *every time* before test_*."""
print('\n' + '=' * 78)
+ @unittest.skip("Requires access to /etc/mtab")
def test_000_update(self):
"""Update stats (mandatory step for all the stats).
@@ -87,6 +88,7 @@ class TestGlances(unittest.TestCase):
for plugin in plugins_to_check:
self.assertTrue(plugin in plugins_list)
+ @unittest.skip("Fails on NixOS")
def test_002_system(self):
"""Check SYSTEM plugin."""
stats_to_check = ['hostname', 'os_name']
@@ -97,6 +99,7 @@ class TestGlances(unittest.TestCase):
self.assertTrue(stat in stats_grab, msg='Cannot find key: %s' % stat)
print('INFO: SYSTEM stats: %s' % stats_grab)
+ @unittest.skip("Fails on NixOS")
def test_003_cpu(self):
"""Check CPU plugin."""
stats_to_check = ['system', 'user', 'idle']
@@ -110,7 +113,7 @@ class TestGlances(unittest.TestCase):
self.assertLessEqual(stats_grab[stat], 100)
print('INFO: CPU stats: %s' % stats_grab)
- @unittest.skipIf(WINDOWS, "Load average not available on Windows")
+ @unittest.skip("Fails on NixOS")
def test_004_load(self):
"""Check LOAD plugin."""
stats_to_check = ['cpucore', 'min1', 'min5', 'min15']
@@ -123,6 +126,7 @@ class TestGlances(unittest.TestCase):
self.assertGreaterEqual(stats_grab[stat], 0)
print('INFO: LOAD stats: %s' % stats_grab)
+ @unittest.skip("Fails on NixOS")
def test_005_mem(self):
"""Check MEM plugin."""
stats_to_check = ['available', 'used', 'free', 'total']
@@ -135,6 +139,7 @@ class TestGlances(unittest.TestCase):
self.assertGreaterEqual(stats_grab[stat], 0)
print('INFO: MEM stats: %s' % stats_grab)
+ @unittest.skip("Fails on NixOS")
def test_006_swap(self):
"""Check MEMSWAP plugin."""
stats_to_check = ['used', 'free', 'total']
@@ -191,6 +196,7 @@ class TestGlances(unittest.TestCase):
self.assertTrue(type(stats_grab) is list, msg='Folders stats is not a list')
print('INFO: Folders stats: %s' % stats_grab)
+ @unittest.skip("Fails on NixOS (TODO)")
def test_012_ip(self):
"""Check IP plugin."""
print('INFO: [TEST_012] Check IP stats')

6
pkgs/development/python-modules/goocalendar/default.nix
View File

@@ -14,13 +14,13 @@ with stdenv.lib;
buildPythonPackage rec {
pname = "GooCalendar";
version = "0.6";
version = "0.7.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "4c22c93e19b933d10d8ea1c67a67f485267af82175ef59419427dd39d1e3af18";
sha256 = "14m05pi1vwl7i8iv1wvc0r3450dlivsh85f4cyny08l869cr9lf1";
};
nativeBuildInputs = [
@@ -42,7 +42,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "A calendar widget for GTK using PyGoocanvas.";
homepage = https://goocalendar.tryton.org/;
homepage = "https://goocalendar.tryton.org/";
license = licenses.gpl2;
maintainers = [ maintainers.udono ];
};

53
pkgs/development/python-modules/gtts/default.nix Normal file
View File

@@ -0,0 +1,53 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, beautifulsoup4
, click
, gtts-token
, mock
, pytest
, requests
, six
, testfixtures
, twine
, urllib3
}:
buildPythonPackage rec {
pname = "gtts";
version = "2.1.1";
src = fetchFromGitHub {
owner = "pndurette";
repo = "gTTS";
rev = "v${version}";
sha256 = "1d0r6dnb8xvgyvxz7nfj4q4xqmpmvcwcsjghxrh76m6p364lh1hj";
};
propagatedBuildInputs = [
beautifulsoup4
click
gtts-token
requests
six
urllib3
twine
];
checkInputs = [ pytest mock testfixtures ];
# majority of tests just try to call out to Google's Translate API endpoint
doCheck = false;
checkPhase = ''
pytest
'';
pythonImportsCheck = [ "gtts" ];
meta = with lib; {
description = "A Python library and CLI tool to interface with Google Translate text-to-speech API";
homepage = "https://gtts.readthedocs.io";
license = licenses.mit;
maintainers = with maintainers; [ unode ];
};
}

4
pkgs/development/python-modules/hass-nabucasa/default.nix
View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
version = "0.29";
version = "0.31";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
sha256 = "182nh5i3hlj0kqkbynk69md0ddq83w02l8lz4m03d8xbjixzi1k1";
sha256 = "0hxdvdj41gq5ryafjhrcgf6y8l33lyf45a1vgwwbk0q29sir9bnr";
};
# upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119

5
pkgs/development/python-modules/ics/default.nix
View File

@@ -5,14 +5,14 @@
buildPythonPackage rec {
pname = "ics";
version = "0.6";
version = "0.7";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "C4ptainCrunch";
repo = "ics.py";
rev = "v${version}";
sha256 = "02bs9wlh40p1n33jchrl2cdpsnm5hq84070by3b6gm0vmgz6gn5v";
sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn";
};
propagatedBuildInputs = [ tatsu arrow ];
@@ -34,6 +34,7 @@ buildPythonPackage rec {
write ics data in a developer friendly way.
'';
homepage = "http://icspy.readthedocs.org/en/stable/";
changelog = "https://github.com/C4ptainCrunch/ics.py/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ primeos ];
};

6
pkgs/development/python-modules/identify/default.nix
View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
version = "1.4.10";
version = "1.4.11";
src = fetchPypi {
inherit pname version;
sha256 = "0q1k22n8w7mmab1vh2r3bsqbxkxbb2zka548rcnn2rd9yg8rxnca";
sha256 = "15kbcgqz6zf9qqvyw3pwy611knv1lyaqmc213ivmqciq3zifn96q";
};
# Tests not included in PyPI tarball
@@ -14,7 +14,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "File identification library for Python";
homepage = https://github.com/chriskuehl/identify;
homepage = "https://github.com/chriskuehl/identify";
license = licenses.mit;
};
}

25
pkgs/development/python-modules/ifconfig-parser/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, fetchFromGitHub }:
buildPythonPackage rec {
pname = "ifconfig-parser";
version = "0.0.5";
src = fetchFromGitHub {
owner = "KnightWhoSayNi";
repo = pname;
rev = "4921ac9d6be6244b062d082c164f5a5e69522478";
sha256 = "07hbkbr1qspr7qgzldkaslzc6ripj5zlif12d4fk5j801yhvnxjd";
};
checkPhase = ''
export PYTHONPATH=$PYTHONPATH:$(pwd)/ifconfigparser:$(pwd)/ifconfigparser/tests
python -m unittest -v test_ifconfig_parser.TestIfconfigParser
'';
meta = with stdenv.lib; {
description = "Unsophisticated python package for parsing raw output of ifconfig.";
homepage = "https://github.com/KnightWhoSayNi/ifconfig-parser";
license = licenses.mit;
maintainers = with maintainers; [ atemu ];
};
}

6
pkgs/development/python-modules/ipdb/default.nix
View File

@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "ipdb";
version = "0.12.3";
version = "0.13.0";
disabled = isPyPy; # setupterm: could not find terminfo database
src = fetchPypi {
inherit pname version;
sha256 = "1zbj7xjhkr44grfyv1hb7ff5n1218f9jjabgzica29vh7c74m6jx";
sha256 = "0nbs9m2pqg4j10m7c31vyb8h7wy29d9s8kiv0k2igbr821k1y3xr";
};
propagatedBuildInputs = [ ipython ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
homepage = https://github.com/gotcha/ipdb;
homepage = "https://github.com/gotcha/ipdb";
description = "IPython-enabled pdb";
license = licenses.bsd0;
maintainers = [ maintainers.costrouc ];

16
pkgs/development/python-modules/ipykernel/default.nix
View File

@@ -16,7 +16,6 @@
buildPythonPackage rec {
pname = "ipykernel";
version = "5.1.4";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
@@ -38,12 +37,23 @@ buildPythonPackage rec {
preCheck = ''
export HOME=$(mktemp -d)
'';
disabledTests = lib.optionals stdenv.isDarwin [
disabledTests = lib.optionals stdenv.isDarwin ([
# see https://github.com/NixOS/nixpkgs/issues/76197
"test_subprocess_print"
"test_subprocess_error"
"test_ipython_start_kernel_no_userns"
];
] ++ lib.optionals (pythonOlder "3.8") [
# flaky test https://github.com/ipython/ipykernel/issues/485
"test_shutdown"
# test regression https://github.com/ipython/ipykernel/issues/486
"test_sys_path_profile_dir"
"test_save_history"
"test_help_output"
"test_write_kernel_spec"
"test_ipython_start_kernel_userns"
"ZMQDisplayPublisherTests"
]);
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;

28
pkgs/development/python-modules/jc/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi,
ruamel_yaml
, ifconfig-parser
, xmltodict
, isPy27
}:
buildPythonPackage rec {
pname = "jc";
version = "1.7.5";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "16ndzvyvx4s3b6cnhxbd5fs3fkc3fwygz7qzaw7ws76sag1zpx67";
};
propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ];
meta = with stdenv.lib; {
description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output.";
homepage = "https://github.com/kellyjonbrazil/jc";
license = licenses.mit;
maintainers = with maintainers; [ atemu ];
};
}

21
pkgs/development/python-modules/jsonpath/default.nix Normal file
View File

@@ -0,0 +1,21 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "jsonpath";
version = "0.82";
src = fetchPypi {
inherit pname version;
sha256 = "46d3fd2016cd5b842283d547877a02c418a0fe9aa7a6b0ae344115a2c990fef4";
};
meta = with lib; {
description = "An XPath for JSON";
homepage = "https://github.com/json-path/JsonPath";
license = licenses.mit;
maintainers = [ maintainers.mic92 ];
};
}

6
pkgs/development/python-modules/jupytext/default.nix
View File

@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "jupytext";
version = "1.3.2";
version = "1.3.4";
src = fetchPypi {
inherit pname version;
sha256 = "081c8dbql93bpl72pzg0z8vg482r3f350490mhqn965s10bz8say";
sha256 = "0jijf4a3iaskzi6frjwhd8drh7brn94r1zl7gni6d0dzr296mm93";
};
propagatedBuildInputs = [
@@ -32,7 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts";
homepage = https://github.com/mwouts/jupytext;
homepage = "https://github.com/mwouts/jupytext";
license = licenses.mit;
maintainers = with maintainers; [ timokau ];
};

6
pkgs/development/python-modules/localzone/default.nix
View File

@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "localzone";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "ags-slc";
repo = pname;
rev = "v${version}";
sha256 = "1zziqyhbg8vg901b4hjzzab0paag5cng48vk9xf1hchxk5naf58n";
sha256 = "154l7qglsm4jrhqddvlas8cgl9qm2z4dzihv05jmsyqjikcmfwk8";
};
propagatedBuildInputs = [ dnspython sphinx ];
@@ -27,7 +27,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "A simple DNS library for managing zone files";
homepage = https://localzone.iomaestro.com;
homepage = "https://localzone.iomaestro.com";
license = licenses.bsd3;
maintainers = with maintainers; [ flyfloh ];
};

6
pkgs/development/python-modules/orderedset/default.nix
View File

@@ -2,16 +2,16 @@
buildPythonPackage rec {
pname = "orderedset";
version = "2.0.1";
version = "2.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "11643qr12ypxfffcminlsgl9xz751b2d0pnjl6zn8vfhxddjr57f";
sha256 = "0abf19w37kxypsj6v7dz79jj92y1kivjk2zivnrv7rw6bbxwrxdj";
};
meta = with stdenv.lib; {
description = "An Ordered Set implementation in Cython";
homepage = https://pypi.python.org/pypi/orderedset;
homepage = "https://pypi.python.org/pypi/orderedset";
license = licenses.bsd3;
maintainers = [ maintainers.jtojnar ];
};

60
pkgs/development/python-modules/osmpythontools/default.nix Normal file
View File

@@ -0,0 +1,60 @@
{ lib
, buildPythonPackage
, fetchPypi
, beautifulsoup4
, geojson
, lxml
, matplotlib
, numpy
, pandas
, ujson
, xarray
}:
buildPythonPackage rec {
pname = "osmpythontools";
version = "0.2.6";
src = fetchPypi {
pname = "OSMPythonTools";
inherit version;
sha256 = "efc72e3963971c6c7fd94bd374704a5b78eb6c07397a4ffb5f9176c1e4aee096";
};
propagatedBuildInputs = [
beautifulsoup4
geojson
lxml
matplotlib
numpy
pandas
ujson
xarray
];
patches = [ ./remove-unused-dependency.patch ];
# no tests included
doCheck = false;
pythonImportsCheck = [
"OSMPythonTools"
"OSMPythonTools.api"
"OSMPythonTools.data"
"OSMPythonTools.element"
"OSMPythonTools.nominatim"
"OSMPythonTools.overpass"
];
meta = with lib; {
description = "A library to access OpenStreetMap-related services";
longDescription = ''
The python package OSMPythonTools provides easy access to
OpenStreetMap-related services, among them an Overpass endpoint,
Nominatim, and the OpenStreetMap editing API.
'';
homepage = "https://github.com/mocnik-science/osm-python-tools";
license = licenses.gpl3;
maintainers = with maintainers; [ das-g ];
};
}

22
pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/OSMPythonTools.egg-info/requires.txt b/OSMPythonTools.egg-info/requires.txt
index 16a5019..e58155c 100644
--- a/OSMPythonTools.egg-info/requires.txt
+++ b/OSMPythonTools.egg-info/requires.txt
@@ -1,5 +1,4 @@
beautifulsoup4
-datetime
geojson
lxml
matplotlib
diff --git a/setup.py b/setup.py
index 08e9455..1a6435e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,6 @@ setup(
packages = ['OSMPythonTools', 'OSMPythonTools.internal'],
install_requires = [
'beautifulsoup4',
- 'datetime',
'geojson',
'lxml',
'matplotlib',

6
pkgs/development/python-modules/phonenumbers/default.nix
View File

@@ -2,16 +2,16 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.11.3";
version = "8.11.4";
src = fetchPypi {
inherit pname version;
sha256 = "1rh0860ml00kw5c4b4r31wz5s8cmd5mpxx5slypdgljk4ralyg6p";
sha256 = "13hfcw89kppm8s2qx0s5bafzxjc0qhm9sxmpf6yqvshz2fn82pk8";
};
meta = {
description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
homepage = https://github.com/daviddrysdale/python-phonenumbers;
homepage = "https://github.com/daviddrysdale/python-phonenumbers";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ fadenb ];
};

7
pkgs/development/python-modules/poetry/default.nix
View File

@@ -32,6 +32,7 @@ let
in buildPythonPackage rec {
pname = "poetry";
version = "1.0.3";
format = "pyproject";
src = fetchPypi {
inherit pname version;
@@ -42,12 +43,10 @@ in buildPythonPackage rec {
substituteInPlace pyproject.toml \
--replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \
--replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \
--replace "importlib-metadata = {version = \"~1.1.3\", python = \"<3.8\"}" \
"importlib-metadata = {version = \"~1.3.0\", python = \"<3.8\"}"
--replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \
'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}'
'';
format = "pyproject";
nativeBuildInputs = [ intreehooks ];
propagatedBuildInputs = [

38
pkgs/development/python-modules/pushover-complete/default.nix Normal file
View File

@@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, six
, tox
, pytest
, pythonOlder
}:
buildPythonPackage rec {
pname = "pushover-complete";
version = "1.1.1";
src = fetchPypi {
pname = "pushover_complete";
inherit version;
sha256 = "8a8f867e1f27762a28a0832c33c6003ca54ee04c935678d124b4c071f7cf5a1f";
};
propagatedBuildInputs = [
requests
six
];
checkInputs = [ pytest tox ];
# Fails also on their travis right now:
# - https://travis-ci.org/scolby33/pushover_complete/builds?utm_medium=notification&utm_source=github_status
doCheck = pythonOlder "3.7";
meta = with lib; {
description = "A Python package for interacting with *all* aspects of the Pushover API";
homepage = https://github.com/scolby33/pushover_complete;
license = licenses.mit;
maintainers = [ maintainers.mic92 ];
};
}

6
pkgs/development/python-modules/pyicloud/default.nix
View File

@@ -10,15 +10,16 @@
, certifi
, bitstring
, unittest2
, future
}:
buildPythonPackage rec {
pname = "pyicloud";
version = "0.9.1";
version = "0.9.2";
src = fetchPypi {
inherit pname version;
sha256 = "580b52e95f67a41ed86c56a514aa2b362f53fbaf23f16c69fb24e0d19fd373ee";
sha256 = "1jjkzf7vwms6pymnmdr893830vrymxnq455xnqp21wqhjjiy2amd";
};
propagatedBuildInputs = [
@@ -30,6 +31,7 @@ buildPythonPackage rec {
tzlocal
certifi
bitstring
future
];
checkInputs = [ unittest2 ];

6
pkgs/development/python-modules/pymupdf/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
buildPythonPackage rec {
pname = "PyMuPDF";
version = "1.16.10";
version = "1.16.11";
src = fetchPypi {
inherit pname version;
sha256 = "d7893954f97fa6087629f3875f3be066dab51302e7c73f4c98c0516a8e2893fb";
sha256 = "006m31qvvdwbpmxnhj1gs7rpd1jb214mf2hacqmisryx8dnb2jm7";
};
patchPhase = ''
@@ -19,7 +19,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Python bindings for MuPDF's rendering library.";
homepage = https://github.com/pymupdf/PyMuPDF;
homepage = "https://github.com/pymupdf/PyMuPDF";
maintainers = with maintainers; [ teto ];
license = licenses.agpl3;
platforms = platforms.linux;

29
pkgs/development/python-modules/python-mpv-jsonipc/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests
, tqdm, websocket_client, pythonOlder }:
buildPythonPackage rec {
pname = "python-mpv-jsonipc";
version = "1.1.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "iwalton3";
repo = "python-mpv-jsonipc";
rev = "v${version}";
sha256 = "08bs6qrcf5fi72jijmr2w7zs6aa5976dwv04f11ajwhj6i8kfq35";
};
# 'mpv-jsonipc' does not have any tests
doCheck = false;
propagatedBuildInputs = [ requests tqdm websocket_client ];
pythonImportsCheck = [ "python_mpv_jsonipc" ];
meta = with lib; {
homepage = "https://github.com/iwalton3/python-mpv-jsonipc";
description = "Python API to MPV using JSON IPC";
license = licenses.gpl3;
maintainers = with maintainers; [ colemickens ];
};
}

6
pkgs/development/python-modules/rasterio/default.nix
View File

@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "rasterio";
version = "1.1.2";
version = "1.1.3";
# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "mapbox";
repo = "rasterio";
rev = version;
sha256 = "12szhfify7wn02cbiz9xapwfyp7bg0zm2ja9wq4jyaz5ijy6rm45";
sha256 = "0i081bkmv7qw24ivmdh92ma6x0hnjlf8jgj6rp2c3rb8hjzmi452";
};
checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python package to read and write geospatial raster data";
license = licenses.bsd3;
homepage = https://rasterio.readthedocs.io/en/latest/;
homepage = "https://rasterio.readthedocs.io/en/latest/";
maintainers = with maintainers; [ mredaelli ];
};
}

53
pkgs/development/python-modules/slackclient/default.nix
View File

@@ -1,29 +1,58 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, websocket_client, requests, six, pytest, codecov, coverage, mock, pytestcov, pytest-mock, responses, flake8 }:
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, aiohttp
, black
, codecov
, flake8
, isPy3k
, mock
, pytest-mock
, pytestCheckHook
, pytestcov
, pytestrunner
, requests
, responses
, six
, websocket_client
}:
buildPythonPackage rec {
pname = "python-slackclient";
version = "1.2.1";
version = "2.5.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = pname;
rev = version;
sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0";
sha256 = "1ngj1mivbln19546195k400w9yaw69g0w6is7c75rqwyxr8wgzsk";
};
propagatedBuildInputs = [ websocket_client requests six ];
propagatedBuildInputs = [
aiohttp
websocket_client
requests
six
];
checkInputs = [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ];
# test_server.py fails because it needs connection (I think);
checkPhase = ''
py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py
'';
checkInputs = [
black
codecov
flake8
mock
pytest-mock
pytestCheckHook
pytestcov
pytestrunner
responses
];
meta = with stdenv.lib; {
description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API";
homepage = https://github.com/slackapi/python-slackclient;
homepage = "https://github.com/slackapi/python-slackclient";
license = licenses.mit;
maintainers = with maintainers; [ psyanticy ];
maintainers = with maintainers; [ flokli psyanticy ];
};
}

6
pkgs/development/python-modules/smmap/default.nix
View File

@@ -2,17 +2,17 @@
buildPythonPackage rec {
pname = "smmap";
version = "0.9.0";
version = "3.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf";
sha256 = "0ijlnv60y8f41py1wnn5n1a1i81cxd9dfpdhr0k3cgkrcbz8850p";
};
checkInputs = [ nosexcover ];
meta = {
description = "A pure python implementation of a sliding window memory map manager";
homepage = https://github.com/gitpython-developers/smmap;
homepage = "https://github.com/gitpython-developers/smmap";
maintainers = [ ];
license = lib.licenses.bsd3;
};

27
pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, fetchPypi, buildPythonPackage
, numpy
, absl-py
, mock
}:
buildPythonPackage rec {
pname = "tensorflow-estimator";
version = "1.15.1";
format = "wheel";
src = fetchPypi {
pname = "tensorflow_estimator";
inherit version format;
sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8";
};
propagatedBuildInputs = [ mock numpy absl-py ];
meta = with stdenv.lib; {
description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting.";
homepage = http://tensorflow.org;
license = licenses.asl20;
maintainers = with maintainers; [ jyp ];
};
}

7
pkgs/development/python-modules/tensorflow-estimator/default.nix
View File

@@ -1,19 +1,18 @@
{ stdenv, fetchPypi, buildPythonPackage
, numpy
, absl-py
, absl-py
, mock
}:
buildPythonPackage rec {
pname = "tensorflow-estimator";
# This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before actually updating the version in setup.py, which is why this tag is called 1.15.1.
version = "1.15.1";
version = "2.1.0";
format = "wheel";
src = fetchPypi {
pname = "tensorflow_estimator";
inherit version format;
sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8";
sha256 = "0wk9viil54ms1s2ir7zxygqa425i69hx8zngwhdqvw9nlr4gdig5";
};
propagatedBuildInputs = [ mock numpy absl-py ];

2
pkgs/development/python-modules/tensorflow-probability/default.nix
View File

@@ -42,7 +42,7 @@ let
bazelTarget = ":pip_pkg";
fetchAttrs = {
sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx";
};
buildAttrs = {

8
pkgs/development/python-modules/tensorflow-tensorboard/default.nix
View File

@@ -7,6 +7,7 @@
, markdown
, futures
, absl-py
, google-auth-oauthlib
}:
# tensorflow/tensorboard is built from a downloaded wheel, because
@@ -15,7 +16,7 @@
buildPythonPackage rec {
pname = "tensorflow-tensorboard";
version = "1.15.0";
version = "2.1.0";
format = "wheel";
src = fetchPypi ({
@@ -24,10 +25,10 @@ buildPythonPackage rec {
format = "wheel";
} // (if isPy3k then {
python = "py3";
sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac";
sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6";
} else {
python = "py2";
sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1";
sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w";
}));
propagatedBuildInputs = [
@@ -37,6 +38,7 @@ buildPythonPackage rec {
markdown
grpcio
absl-py
google-auth-oauthlib
# not declared in install_requires, but used at runtime
# https://github.com/NixOS/nixpkgs/issues/73840
wheel

106
pkgs/development/python-modules/tensorflow/bin.nix
View File

@@ -14,6 +14,9 @@
, absl-py
, grpcio
, mock
, scipy
, wheel
, opt-einsum
, backports_weakref
, tensorflow-estimator
, tensorflow-tensorboard
@@ -55,21 +58,22 @@ in buildPythonPackage {
src = let
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;
platform = if stdenv.isDarwin then "mac" else "linux";
unit = if cudaSupport then "gpu" else "cpu";
key = "${platform}_py_${pyver}_${unit}";
key = "${platform}_py_${pyVerNoDot}_${unit}";
in fetchurl packages.${key};
propagatedBuildInputs = [
protobuf
numpy
scipy
termcolor
grpcio
six
astor
absl-py
gast
opt-einsum
google-pasta
wrapt
tensorflow-estimator
@@ -79,40 +83,94 @@ in buildPythonPackage {
] ++ lib.optional (!isPy3k) mock
++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport addOpenGLRunpath;
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propageted input tensorflow-tensorboard which causes environment collisions.
# another possibility would be to have tensorboard only in the buildInputs
# https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79
postInstall = ''
rm $out/bin/tensorboard
preConfigure = ''
unset SOURCE_DATE_EPOCH
# Make sure that dist and the wheel file are writable.
chmod u+rwx -R ./dist
pushd dist
# Unpack the wheel file.
wheel unpack --dest unpacked ./*.whl
# Tensorflow has a hard dependency on gast==0.2.2, but we relax it to
# gast==0.3.2.
substituteInPlace ./unpacked/tensorflow*/tensorflow_core/tools/pip_package/setup.py --replace "gast == 0.2.2" "gast == 0.3.2"
substituteInPlace ./unpacked/tensorflow*/tensorflow_*.dist-info/METADATA --replace "gast (==0.2.2)" "gast (==0.3.2)"
# Pack the wheel file back up.
wheel pack ./unpacked/tensorflow*
popd
'';
# Note that we need to run *after* the fixup phase because the
# libraries are loaded at runtime. If we run in preFixup then
# patchelf --shrink-rpath will remove the cuda libraries.
postFixup = let
rpath = stdenv.lib.makeLibraryPath
([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
in
lib.optionalString stdenv.isLinux ''
rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}"
internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
patchelf --set-rpath "$rrPath" "$lib"
${lib.optionalString cudaSupport ''
addOpenGLRunpath "$lib"
''}
done
'';
postFixup =
let
# rpaths we only need to add if CUDA is enabled.
cudapaths = lib.optionals cudaSupport [
cudatoolkit.out
cudatoolkit.lib
cudnn
nvidia_x11
];
libpaths = [
stdenv.cc.cc.lib
zlib
];
rpath = stdenv.lib.makeLibraryPath (libpaths ++ cudapaths);
in
lib.optionalString stdenv.isLinux ''
# This is an array containing all the directories in the tensorflow2
# package that contain .so files.
#
# TODO: Create this list programmatically, and remove paths that aren't
# actually needed.
rrPathArr=(
"$out/${python.sitePackages}/tensorflow_core/"
"$out/${python.sitePackages}/tensorflow_core/compiler/tf2tensorrt/"
"$out/${python.sitePackages}/tensorflow_core/compiler/tf2xla/ops/"
"$out/${python.sitePackages}/tensorflow_core/lite/experimental/microfrontend/python/ops/"
"$out/${python.sitePackages}/tensorflow_core/lite/python/interpreter_wrapper/"
"$out/${python.sitePackages}/tensorflow_core/lite/python/optimize/"
"$out/${python.sitePackages}/tensorflow_core/python/"
"$out/${python.sitePackages}/tensorflow_core/python/framework/"
"${rpath}"
)
# The the bash array into a colon-separated list of RPATHs.
rrPath=$(IFS=$':'; echo "''${rrPathArr[*]}")
echo "about to run patchelf with the following rpath: $rrPath"
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
echo "about to patchelf $lib..."
chmod a+rx "$lib"
patchelf --set-rpath "$rrPath" "$lib"
${lib.optionalString cudaSupport ''
addOpenGLRunpath "$lib"
''}
done
'';
pythonImportsCheck = [
"tensorflow"
"tensorflow.keras"
"tensorflow.python"
"tensorflow.python.framework"
];
meta = with stdenv.lib; {
description = "Computation using data flow graphs for scalable machine learning";
homepage = http://tensorflow.org;
license = licenses.asl20;
maintainers = with maintainers; [ jyp abbradar ];
maintainers = with maintainers; [ jyp abbradar cdepillabout ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
# Python 2.7 build uses different string encoding.
# See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253

70
pkgs/development/python-modules/tensorflow/binary-hashes.nix
View File

@@ -1,43 +1,51 @@
{
version = "1.14.0";
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";
};
version = "2.1.0";
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";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp27-cp27mu-manylinux2010_x86_64.whl";
sha256 = "17lnhr7vdrls68c79n3sah5rpd0q1x2v5m84azvlyxxh2wpypfmb";
};
linux_py_27_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp27-cp27mu-manylinux2010_x86_64.whl";
sha256 = "10lz3i4pcpgqrcbjmxm0n7k1gsqlpna3kdid902j2fy060cpi93z";
};
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";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp35-cp35m-manylinux2010_x86_64.whl";
sha256 = "09s081n08dpmflwgir3zwzfijfpmahbh2gy5fn5bv5ll86g1szsy";
};
linux_py_35_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp35-cp35m-manylinux2010_x86_64.whl";
sha256 = "1aa7v9fnvx03hqvhl3x3xcn41qy6qxw5xybg54ifjvvicp455c8l";
};
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";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp36-cp36m-manylinux2010_x86_64.whl";
sha256 = "1dqp080ljbl9v3115vjp63ls0fimiwym6zxyanyhrlk8kwsq20zc";
};
linux_py_36_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp36-cp36m-manylinux2010_x86_64.whl";
sha256 = "133z8anx7xm9rr5i9s9dwnp1wf06nr6s7q1lbs4lxpk6kn9nl480";
};
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";
url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp37-cp37m-manylinux2010_x86_64.whl";
sha256 = "0yabl3xmcpr67w0zksqs3qc68nl9ax0vcd7w7b35nq8f65xl0ghy";
};
mac_py_2_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl";
sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26";
linux_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp37-cp37m-manylinux2010_x86_64.whl";
sha256 = "04gngbngyg7p1gwx1q89my0cl8j7lq4kknqh51s2ynrix71zvsy6";
};
mac_py_3_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl";
sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3";
mac_py_27_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp27-cp27m-macosx_10_9_x86_64.whl";
sha256 = "1mprp72w5kk0lyjm2mh4lf57827xk3wsg28c4gizwm00ydfgacg6";
};
mac_py_35_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp35-cp35m-macosx_10_6_intel.whl";
sha256 = "1as7brf5ai6r7v1di9646jfrbnirpk2b0d1g29mn3shavb62kw8w";
};
mac_py_36_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp36-cp36m-macosx_10_9_x86_64.whl";
sha256 = "1v1rw9kjrskhcq1yas4ly2yfnzf2i1pjh6qg6zixfbkpkw7sw3wc";
};
mac_py_37_cpu = {
url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl";
sha256 = "1hh4n0d97mrq35cmmsrnlmcv9vlswsyjy368lj3pda3y9dvck3rf";
};
}

20
pkgs/development/python-modules/tensorflow/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
, addOpenGLRunpath
# Python deps
, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
@@ -7,7 +7,7 @@
, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta
, functools32
, opt-einsum
, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator
, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1_15_1
# Common deps
, git, swig, which, binutils, glibcLocales, cython
# Common libraries
@@ -69,7 +69,7 @@ let
tfFeature = x: if x then "1" else "0";
version = "1.15.0";
version = "1.15.1";
variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}";
@@ -94,6 +94,7 @@ let
bazel-build = buildBazelPackage {
name = "${pname}-${version}";
bazel = bazel_1;
src = fetchFromGitHub {
owner = "tensorflow";
@@ -114,6 +115,11 @@ let
url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch";
sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di";
})
(fetchpatch {
name = "backport-pr-18950.patch";
url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch";
sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz";
})
./tf-1.15-bazel-1.0.patch
@@ -290,10 +296,12 @@ let
TF_SYSTEM_LIBS = null;
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
# FIXME: can't (re)produce this output with current bazel.
# FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35
sha256 = if cudaSupport then
"1rbg8w8pjf15hpvzrclsi19lhsrwdns6f8psb1wz35ay0ggdw8c0"
"0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im"
else
"0d8wq89iz9vrzvr971mgdclxxjcjr32r7aj817h019x3pc53qnwx";
"04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz";
};
buildAttrs = {
@@ -368,7 +376,7 @@ in buildPythonPackage {
numpy
six
protobuf
tensorflow-estimator
tensorflow-estimator_1_15_1
termcolor
wrapt
grpcio

61
pkgs/development/python-modules/tensorflow/prefetcher.sh
View File

@@ -1,33 +1,44 @@
#!/usr/bin/env bash
version=1.14.0
version=2.1.0
# List of binary wheels for Tensorflow. The most recent versions can be found
# on the following page:
# https://www.tensorflow.org/install/pip?lang=python3#package-location
url_and_key_list=(
"linux_py_27_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp27-cp27mu-manylinux2010_x86_64.whl"
"linux_py_27_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp27-cp27mu-manylinux2010_x86_64.whl"
"linux_py_35_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp35-cp35m-manylinux2010_x86_64.whl"
"linux_py_35_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp35-cp35m-manylinux2010_x86_64.whl"
"linux_py_36_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp36-cp36m-manylinux2010_x86_64.whl"
"linux_py_36_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp36-cp36m-manylinux2010_x86_64.whl"
"linux_py_37_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl"
"linux_py_37_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl"
"mac_py_27_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp27-cp27m-macosx_10_9_x86_64.whl"
"mac_py_35_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp35-cp35m-macosx_10_6_intel.whl"
"mac_py_36_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp36-cp36m-macosx_10_9_x86_64.whl"
"mac_py_37_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_9_x86_64.whl"
)
hashfile=binary-hashes.nix
rm -f $hashfile
echo "{" >> $hashfile
echo "version = \"$version\";" >> $hashfile
for sys in "linux" "mac"; do
for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do
for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do
if [ $sys == "mac" ]; then
[[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]]
result=$?
pyver=${pykind:2:1}
flavour=cpu
else
[[ $pykind =~ .*linux.* ]]
result=$?
pyver=${pykind:2:2}
flavour=${tfpref:0:3}
fi
if [ $result == 0 ]; then
url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl
hash=$(nix-prefetch-url $url)
echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile
echo " url = \"$url\";" >> $hashfile
echo " sha256 = \"$hash\";" >> $hashfile
echo "};" >> $hashfile
fi
done
done
for url_and_key in "${url_and_key_list[@]}"; do
key=$(echo "$url_and_key" | cut -d' ' -f1)
url=$(echo "$url_and_key" | cut -d' ' -f2)
echo "prefetching ${url}..."
hash=$(nix-prefetch-url $url)
echo "$key = {" >> $hashfile
echo " url = \"$url\";" >> $hashfile
echo " sha256 = \"$hash\";" >> $hashfile
echo "};" >> $hashfile
echo
done
echo "}" >> $hashfile
echo "done."

6
pkgs/development/python-modules/tomlkit/default.nix
View File

@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "tomlkit";
version = "0.5.8";
version = "0.5.11";
src = fetchPypi {
inherit pname version;
sha256 = "32c10cc16ded7e4101c79f269910658cc2a0be5913f1252121c3cd603051c269";
sha256 = "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h";
};
propagatedBuildInputs =
@@ -21,7 +21,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
homepage = https://github.com/sdispater/tomlkit;
homepage = "https://github.com/sdispater/tomlkit";
description = "Style-preserving TOML library for Python";
license = licenses.mit;
maintainers = with maintainers; [ jakewaksbaum ];