From 9cae7113888541bcea78be21c6a57ed564cb7d6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 29 Aug 2020 14:21:08 +0200 Subject: [PATCH] grab-site: override Python package set with desired tornado version --- pkgs/tools/backup/grab-site/default.nix | 14 +++++++++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 81e16ad005b..e69823ab45d 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,6 +1,14 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stdenv, python37, fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +let + python = python37.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_4; + }; + }; + +in with python.pkgs; buildPythonApplication rec { version = "2.1.19"; name = "grab-site-${version}"; @@ -11,7 +19,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f290d376407..cc3d9f8fa6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12529,9 +12529,7 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { - python3Packages = python37Packages; - }; + grab-site = callPackage ../tools/backup/grab-site { }; grib-api = callPackage ../development/libraries/grib-api { };