git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #59273 from veprbl/pr/snakemake_5.4.4

snakemake: 5.2.2 -> 5.4.4

commit391e47406220ce825c11e7539ff30389164ef3c0 authorPascal Wittmann <mail@pascal-wittmann.de> dateThu 11 Apr 2019, 14:41 (8 years ago) parentaea1ebdc321b64
2 files changed+12−3
pkgs/applications/science/misc/snakemake/default.nix+3−2 pkgs/development/python-modules/datrie/default.nix+9−1
pkgs/applications/science/misc/snakemake/default.nix+3−2
@@ -5,13 +5,14 @@
55
66python.buildPythonPackage rec {
77 pname = "snakemake";
8− version = "5.2.2";
8+ version = "5.4.4";
99
1010 propagatedBuildInputs = with python; [
1111 appdirs
1212 ConfigArgParse
1313 datrie
1414 docutils
15+ GitPython
1516 jsonschema
1617 pyyaml
1718 ratelimiter
@@ -21,7 +22,7 @@ python.buildPythonPackage rec {
2122
2223 src = python.fetchPypi {
2324 inherit pname version;
24− sha256 = "adffe7e24b4a613a9e8bf0a2a320b3cea236d86afb9132bb0bbbc08b8e35a3a3";
25+ sha256 = "157323e0e1be34302edbbf399b2acbe25a4291bceffd47a0469963a970c9375f";
2526 };
2627
2728 doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
pkgs/development/python-modules/datrie/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi
1+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
22, cython, pytest, pytestrunner, hypothesis }:
33
44buildPythonPackage rec {
@@ -10,6 +10,14 @@ buildPythonPackage rec {
1010 sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs";
1111 };
1212
13+ patches = [
14+ # fix tests against recent hypothesis
15+ (fetchpatch {
16+ url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff";
17+ sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy";
18+ })
19+ ];
20+
1321 nativeBuildInputs = [ cython ];
1422 buildInputs = [ pytest pytestrunner hypothesis ];
1523