From ad7591c3ff8d75d4ea0a4cc72d0c1473a68cd0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 28 Jan 2019 21:30:14 +0100 Subject: [PATCH 1/2] buku: 3.8 -> 4.1 --- pkgs/applications/misc/buku/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index dacfa908b51..0a1275cb17a 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "3.8"; + version = "4.1"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0gv26c4rr1akcaiff1nrwil03sv7d58mfxr86pgsw6nwld67ns0r"; + sha256 = "166l1fmpqn4hys4l0ssc4yd590mmav1w62vm9l5ijhjhmlnrzfax"; }; checkInputs = [ @@ -33,8 +33,17 @@ with python3.pkgs; buildPythonApplication rec { arrow werkzeug click + html5lib + vcrpy ]; + postPatch = '' + # Jailbreak problematic dependencies + sed -i \ + -e "s,'PyYAML.*','PyYAML',g" \ + setup.py + ''; + preCheck = '' # Fixes two tests for wrong encoding export PYTHONIOENCODING=utf-8 From 5ddd094ce06cf40adf7b822a47d5e0b075ed1a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Wed, 30 Jan 2019 07:49:41 +0100 Subject: [PATCH 2/2] buku-4.1: pinned python to python36 due to #52766 still not working, since depending python modules uses python37 instead of wanted python36 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 465f86e1b76..bf6b4f22516 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1818,7 +1818,9 @@ in burp = callPackage ../tools/backup/burp { }; - buku = callPackage ../applications/misc/buku { }; + buku = callPackage ../applications/misc/buku { + python3 = python36; # due to #52766 + }; byzanz = callPackage ../applications/video/byzanz {};