From 732b3359b11b2534424f57dc6241a32feaa42633 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 20 Jun 2020 02:23:38 +0000 Subject: [PATCH 1/2] grab-site: use Python 3.7 to unbreak the build ludios_wpull depends on namedlist, which is incompatible with Python 3.8 --- 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 ca857afc5eea..615ac0c3530e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12080,7 +12080,9 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { }; + grab-site = callPackage ../tools/backup/grab-site { + python3Packages = python37Packages; + }; grib-api = callPackage ../development/libraries/grib-api { }; From 7606a2ad7969a67dd4e5641dd0ee2a389fc8f907 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 20 Jun 2020 02:26:27 +0000 Subject: [PATCH 2/2] grab-site: 2.1.16 -> 2.1.19 --- pkgs/tools/backup/grab-site/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 64a711606f85..81e16ad005b2 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,14 +1,14 @@ { stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - version = "2.1.16"; + version = "2.1.19"; name = "grab-site-${version}"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z"; + sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; }; propagatedBuildInputs = with python3Packages; [