Skip to content

Commit c89666f

Browse files
committed
virt-manager: replace setup_install_args
1 parent 33c45cf commit c89666f

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Formula/v/virt-manager.rb

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class VirtManager < Formula
2020
depends_on "docutils" => :build
2121
depends_on "intltool" => :build
2222
depends_on "pkg-config" => :build
23-
23+
depends_on "python-setuptools" => :build
2424
depends_on "adwaita-icon-theme"
2525
depends_on "certifi"
2626
depends_on "cpio"
@@ -37,44 +37,43 @@ class VirtManager < Formula
3737
depends_on "spice-gtk"
3838
depends_on "vte3"
3939

40-
# Resources are for Python `libvirt-python` and `requests` packages
41-
4240
resource "charset-normalizer" do
4341
url "https://files.pythonhosted.org/packages/63/09/c1bc53dab74b1816a00d8d030de5bf98f724c52c1635e07681d312f20be8/charset-normalizer-3.3.2.tar.gz"
4442
sha256 "f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"
4543
end
4644

4745
resource "idna" do
48-
url "https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438/idna-3.4.tar.gz"
49-
sha256 "814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"
46+
url "https://files.pythonhosted.org/packages/21/ed/f86a79a07470cb07819390452f178b3bef1d375f2ec021ecfc709fc7cf07/idna-3.7.tar.gz"
47+
sha256 "028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"
5048
end
5149

5250
resource "libvirt-python" do
53-
url "https://files.pythonhosted.org/packages/92/92/315e66f442147369a592d2afe07df1321602c5c5ef93ed15cf4eecf90ffb/libvirt-python-9.9.0.tar.gz"
54-
sha256 "a97327417851b72aa24e24cdfe10765df0037b9775564cd19bcee25e22b341ea"
51+
url "https://files.pythonhosted.org/packages/47/f7/5c5112f79761616bf0388b97bb4d0ea1de1d015fb46a40672fe56fdc8ef0/libvirt-python-10.2.0.tar.gz"
52+
sha256 "483a2e38ffc2e65f743e4c819ccb45135dbe50b594a0a2cd60b73843dcfde694"
5553
end
5654

5755
resource "requests" do
5856
url "https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3/requests-2.31.0.tar.gz"
5957
sha256 "942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"
6058
end
6159

62-
# requests require "urllib3>=1.21.1,<1.27"
6360
resource "urllib3" do
64-
url "https://files.pythonhosted.org/packages/0c/39/64487bf07df2ed854cc06078c27c0d0abc59bd27b32232876e403c333a08/urllib3-1.26.18.tar.gz"
65-
sha256 "f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"
61+
url "https://files.pythonhosted.org/packages/7a/50/7fd50a27caa0652cd4caf224aa87741ea41d3265ad13f010886167cfcc79/urllib3-2.2.1.tar.gz"
62+
sha256 "d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
6663
end
6764

6865
def install
69-
python = "python3.12"
70-
venv = virtualenv_create(libexec, python)
66+
python3 = "python3.12"
67+
venv = virtualenv_create(libexec, python3)
7168
venv.pip_install resources
7269

73-
args = Language::Python.setup_install_args(prefix, python)
74-
args.insert((args.index "install"), "--no-update-icon-cache", "--no-compile-schemas")
75-
70+
# Restore disabled egg_info command
71+
inreplace "setup.py", "'install_egg_info': my_egg_info,", ""
7672
system libexec/"bin/python", "setup.py", "configure", "--prefix=#{prefix}"
77-
system libexec/"bin/python", *args
73+
ENV["PIP_CONFIG_SETTINGS"] = "--global-option=--no-update-icon-cache --no-compile-schemas"
74+
venv.pip_install_and_link buildpath
75+
76+
prefix.install libexec/"share"
7877
end
7978

8079
def post_install

pypi_formula_mappings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,8 @@
782782
"extra_packages": ["setuptools"]
783783
},
784784
"virt-manager": {
785-
"exclude_packages": ["certifi"]
785+
"exclude_packages": ["certifi"],
786+
"extra_packages": ["libvirt-python", "requests"]
786787
},
787788
"virtualfish": {
788789
"extra_packages": ["setuptools"]

0 commit comments

Comments
 (0)