pythonPackages.beautifulsoup: Move into pyload, no longer depended upon by any packages

+29 -21
+20
pkgs/applications/networking/pyload/beautifulsoup.nix
···
··· 1 + { pythonPackages, isPy3k, pkgs }: 2 + 3 + pythonPackages.buildPythonPackage rec { 4 + name = "beautifulsoup-3.2.1"; 5 + disabled = isPy3k; 6 + 7 + src = pkgs.fetchurl { 8 + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; 9 + sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; 10 + }; 11 + 12 + # error: invalid command 'test' 13 + doCheck = false; 14 + 15 + meta = { 16 + homepage = http://www.crummy.com/software/BeautifulSoup/; 17 + license = "bsd"; 18 + description = "Undemanding HTML/XML parser"; 19 + }; 20 + }
+9 -2
pkgs/applications/networking/pyload/default.nix
··· 1 - { stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }: 2 - pythonPackages.buildPythonApplication rec { 3 version = "0.4.9-next"; 4 name = "pyLoad-" + version; 5
··· 1 + { stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey 2 + , pkgs }: 3 + 4 + let 5 + beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix { 6 + inherit pythonPackages; 7 + }; 8 + 9 + in pythonPackages.buildPythonApplication rec { 10 version = "0.4.9-next"; 11 name = "pyLoad-" + version; 12
-19
pkgs/top-level/python-packages.nix
··· 1253 }; 1254 }; 1255 1256 - beautifulsoup = buildPythonPackage (rec { 1257 - name = "beautifulsoup-3.2.1"; 1258 - disabled = isPy3k; 1259 - 1260 - src = pkgs.fetchurl { 1261 - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; 1262 - sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; 1263 - }; 1264 - 1265 - # error: invalid command 'test' 1266 - doCheck = false; 1267 - 1268 - meta = { 1269 - homepage = http://www.crummy.com/software/BeautifulSoup/; 1270 - license = "bsd"; 1271 - description = "Undemanding HTML/XML parser"; 1272 - }; 1273 - }); 1274 - 1275 beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; 1276 1277 beaker = buildPythonPackage rec {
··· 1253 }; 1254 }; 1255 1256 beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; 1257 1258 beaker = buildPythonPackage rec {