Skip to content

Commit 042d0fd

Browse files
[Backport release-25.05] bikeshed: 5.1.2 -> 5.3.2; migrate to by-name (#422394)
2 parents fc19162 + 70b8197 commit 042d0fd

File tree

2 files changed

+11
-41
lines changed

2 files changed

+11
-41
lines changed
Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,32 @@
11
{
22
lib,
3-
buildPythonApplication,
43
fetchPypi,
5-
# build inputs
6-
about-time,
7-
aiofiles,
8-
aiohttp,
9-
aiosignal,
10-
alive-progress,
11-
async-timeout,
12-
attrs,
13-
certifi,
14-
charset-normalizer,
15-
cssselect,
16-
frozenlist,
17-
html5lib,
18-
idna,
19-
isodate,
20-
json-home-client,
21-
kdl-py,
22-
lxml,
23-
multidict,
24-
pillow,
25-
pygments,
26-
requests,
27-
result,
28-
setuptools,
29-
six,
30-
tenacity,
31-
typing-extensions,
32-
uri-template,
33-
urllib3,
34-
webencodings,
35-
widlparser,
36-
yarl,
4+
python3Packages,
375
}:
386

39-
buildPythonApplication rec {
7+
python3Packages.buildPythonApplication rec {
408
pname = "bikeshed";
41-
version = "5.1.2";
9+
version = "5.3.2";
4210
pyproject = true;
4311

4412
src = fetchPypi {
4513
inherit pname version;
46-
hash = "sha256-QIADVcxgJreH2pvXRVIBE5p6nEEYZtTiSo00RrpFT+E=";
14+
hash = "sha256-+TY26g685eIMXUjTG876r9gryg/tR6EtMGWAhk2kkis=";
4715
};
4816

49-
build-system = [ setuptools ];
17+
build-system = [ python3Packages.setuptools ];
5018

5119
pythonRelaxDeps = true;
5220

53-
dependencies = [
21+
dependencies = with python3Packages; [
5422
about-time
5523
aiofiles
5624
aiohttp
5725
aiosignal
5826
alive-progress
5927
async-timeout
6028
attrs
29+
cddlparser
6130
certifi
6231
charset-normalizer
6332
cssselect
@@ -102,6 +71,9 @@ buildPythonApplication rec {
10271
'';
10372
homepage = "https://tabatkins.github.io/bikeshed/";
10473
license = licenses.cc0;
105-
maintainers = [ ];
74+
maintainers = with lib.maintainers; [
75+
matthiasbeyer
76+
hemera
77+
];
10678
};
10779
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,8 +1075,6 @@ with pkgs;
10751075

10761076
auditwheel = with python3Packages; toPythonApplication auditwheel;
10771077

1078-
bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
1079-
10801078
davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix {
10811079
studioVariant = true;
10821080
};

0 commit comments

Comments
 (0)