diff options
author | OTABI Tomoya <tomoya.otabi@gmail.com> | 2023-11-13 11:57:59 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-13 11:57:59 +0900 |
commit | 5d50cc4fd51502cfec4c349d91b02600dfcc7654 (patch) | |
tree | f9a29ee9c597e20a6de6c98fbcb69a7b13673655 | |
parent | c78186e36251ddbae7799c9c5307d3c8cc2de1ac (diff) | |
parent | 9e0c31d76a9a4cdfbd9a3b778a1f3a38f2d68b1e (diff) | |
download | nixpkgs-5d50cc4fd51502cfec4c349d91b02600dfcc7654.tar nixpkgs-5d50cc4fd51502cfec4c349d91b02600dfcc7654.tar.gz nixpkgs-5d50cc4fd51502cfec4c349d91b02600dfcc7654.tar.bz2 nixpkgs-5d50cc4fd51502cfec4c349d91b02600dfcc7654.tar.lz nixpkgs-5d50cc4fd51502cfec4c349d91b02600dfcc7654.tar.xz nixpkgs-5d50cc4fd51502cfec4c349d91b02600dfcc7654.tar.zst nixpkgs-5d50cc4fd51502cfec4c349d91b02600dfcc7654.zip |
Merge pull request #267001 from natsukium/ludios-wpull
{grab-site,python38Packages.ludios_wpull}: remove
-rw-r--r-- | pkgs/development/python-modules/ludios_wpull/default.nix | 41 | ||||
-rw-r--r-- | pkgs/tools/backup/grab-site/default.nix | 59 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
6 files changed, 2 insertions, 104 deletions
diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix deleted file mode 100644 index eae9f78b26a..00000000000 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, chardet -, dnspython -, html5-parser -, lxml -, namedlist -, sqlalchemy -, tornado -, yapsy -, pythonAtLeast -}: - -buildPythonPackage rec { - pname = "ludios_wpull"; - version = "3.0.9"; - - # https://github.com/ArchiveTeam/ludios_wpull/issues/20 - disabled = pythonAtLeast "3.9"; - - src = fetchFromGitHub { - rev = version; - owner = "ArchiveTeam"; - repo = "ludios_wpull"; - sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; - }; - - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado yapsy ]; - - # Test suite has tests that fail on all platforms - doCheck = false; - - meta = { - description = "Web crawler; fork of wpull used by grab-site"; - homepage = "https://github.com/ArchiveTeam/ludios_wpull"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ivan ]; - broken = lib.versions.major tornado.version != "4"; - }; -} diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix deleted file mode 100644 index ee30ab3037a..00000000000 --- a/pkgs/tools/backup/grab-site/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, python38, fetchPypi, fetchFromGitHub }: -let - python = python38.override { - self = python; - packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.24"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; - }; - doCheck = false; - }); - tornado = super.tornado_4; - }; - }; - -in -with python.pkgs; buildPythonApplication rec { - pname = "grab-site"; - version = "2.2.7"; - - src = fetchFromGitHub { - rev = version; - owner = "ArchiveTeam"; - repo = "grab-site"; - sha256 = "sha256-tf8GyFjya3+TVc2VjlY6ztfjCJgof6tg4an18pz+Ig8="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-${ludios_wpull.version}"' '"wpull"' - ''; - - propagatedBuildInputs = [ - click - ludios_wpull - manhole - lmdb - autobahn - fb-re2 - websockets - faust-cchardet - ]; - - checkPhase = '' - export PATH=$PATH:$out/bin - bash ./tests/offline-tests - ''; - - meta = with lib; { - description = "Crawler for web archiving with WARC output"; - homepage = "https://github.com/ArchiveTeam/grab-site"; - license = licenses.mit; - maintainers = with maintainers; [ ivan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 43fb25304da..23301bec0aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -334,6 +334,7 @@ mapAliases ({ graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba8b2315727..799b1fbe31a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21742,8 +21742,6 @@ with pkgs; gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { }; - grilo = callPackage ../development/libraries/grilo { }; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d3a400bb01c..3b1a2e41046 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -227,6 +227,7 @@ mapAliases ({ logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 + ludios_wpull = throw "ludios_wpull has been removed because it's unmaintained and broken"; # added 2023-11-12 Mako = mako; # added 2023-02-19 Markups = markups; # added 2022-02-14 markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09e9e38349c..d8b708e42ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6467,8 +6467,6 @@ self: super: with self; { luddite = callPackage ../development/python-modules/luddite { }; - ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; - luftdaten = callPackage ../development/python-modules/luftdaten { }; luhn = callPackage ../development/python-modules/luhn { }; |