summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-31 19:47:37 +0100
committerGitHub <noreply@github.com>2021-01-31 19:47:37 +0100
commitb5afb2560d2e9ba47c9b346e4f83da7b81b7b0e6 (patch)
tree5736c94ce3baa70c530280327f0895ef01a9cd79
parentb6479673221dc6fcb19abf27c0a0790bc8c2ab5b (diff)
parent9bf2f4b897546e959eb9537a86d2260b7c3b05d7 (diff)
Merge pull request #111356 from risicle/ris-django-silk-4.1.0
pythonPackages.django_silk: 4.0.1 -> 4.1.0
-rw-r--r--pkgs/development/python-modules/django_silk/default.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix
index 90ba6cf2924e..653bcdc55512 100644
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, python
+, pythonAtLeast
, fetchFromGitHub
+, fetchpatch
, django
, pygments
, simplejson
@@ -23,15 +25,23 @@
buildPythonPackage rec {
pname = "django-silk";
- version = "4.0.1";
+ version = "4.1.0";
# pypi tarball doesn't include test project
src = fetchFromGitHub {
owner = "jazzband";
repo = "django-silk";
rev = version;
- sha256 = "0yy9rzxvwlp2xvnw76r9hnqajlp417snam92xpb6ay0hxwslwqyb";
+ sha256 = "1km3hmx1sir0c5gqr2p1h2938slhxp2hzf10cb80q98mas8spjkn";
};
+
+ patches = lib.optional (pythonAtLeast "3.9") (fetchpatch {
+ # should be able to remove after 4.1.1
+ name = "python-3.9-support.patch";
+ url = "https://github.com/jazzband/django-silk/commit/134089e4cad7bd3b76fb0f70c423082cb7d2b34a.patch";
+ sha256 = "09c1xd9y33h3ibiv5w9af9d79c909rgc1g5sxpd4y232h5id3c8r";
+ });
+
# "test_time_taken" tests aren't suitable for reproducible execution, but django's
# test runner doesn't have an easy way to ignore tests - so instead prevent it from picking
# them up as tests