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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/science/math/sage/sage-src.nix
This commit is contained in:
Tuomas Tynkkynen
2018-10-27 19:58:03 +03:00
parent 4b45aa784e f2b8262e05
commit 067d1cf330
58 changed files with 385 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/aiohttp/default.nix
+2 -2
View File
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "aiohttp";
version = "3.3.2";
version = "3.4.4";
src = fetchPypi {
inherit pname version;
sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12";
sha256 = "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi";
};
disabled = pythonOlder "3.5";
pkgs/development/python-modules/aniso8601/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "aniso8601";
version = "3.0.2";
version = "4.0.1";
meta = with stdenv.lib; {
description = "Parses ISO 8601 strings.";
@@ -15,6 +15,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802";
sha256 = "15cwnadw2xdczdi13k9grrgqq67hxgys4l155dqsl2zh3glhsmp7";
};
}
pkgs/development/python-modules/async_timeout/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "async-timeout";
version = "3.0.0";
version = "3.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287";
sha256 = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f";
};
# Circular dependency on aiohttp
pkgs/development/python-modules/djangorestframework/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, django }:
buildPythonPackage rec {
version = "3.8.2";
version = "3.9.0";
pname = "djangorestframework";
src = fetchPypi {
inherit pname version;
sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9";
sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30";
};
# Test settings are missing
pkgs/development/python-modules/grip/default.nix
+2 -2
View File
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "grip";
version = "4.4.0";
version = "4.5.2";
src = fetchFromGitHub {
owner = "joeyespo";
repo = "grip";
rev = "v${version}";
sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag";
sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm";
};
patches = [
pkgs/development/python-modules/phonenumbers/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.9.15";
version = "8.9.16";
src = fetchPypi {
inherit pname version;
sha256 = "8e9664ce0a838c81f4fb3e4d271c76859d26bde57242d64fe1632ab636f5319f";
sha256 = "1camfcbvbl0xljxmd4h8smcfg3ris19jjznjv5zcbrxr28fafq74";
};
meta = {
pkgs/development/python-modules/praw/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "praw";
version = "5.4.0";
version = "6.0.0";
src = fetchFromGitHub {
owner = "praw-dev";
repo = "praw";
rev = "v${version}";
sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb";
sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i";
};
postPatch = ''