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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-06-09 12:26:34 +02:00
parent 326148ec9b d41c43e4a9
commit 480cd436fc
55 changed files with 475 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,11 +21,11 @@
buildPythonPackage rec {
pname = "cryptography";
version = "2.6.1"; # Also update the hash in vectors.nix
version = "2.7"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16";
sha256 = "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76";
};
outputs = [ "out" "dev" ];

2
pkgs/development/python-modules/cryptography/vectors.nix
View File

@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3";
sha256 = "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi";
};
# No tests included

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

@@ -2,13 +2,15 @@
buildPythonPackage rec {
pname = "scandir";
version = "1.7";
version = "1.10.0";
src = fetchPypi {
inherit pname version;
sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj";
sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
};
checkPhase = "python test/run_tests.py";
meta = with lib; {
description = "A better directory iterator and faster os.walk()";
homepage = https://github.com/benhoyt/scandir;