Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jinja2: fix dependencies #96381

Closed
wants to merge 43 commits into from
Closed

jinja2: fix dependencies #96381

wants to merge 43 commits into from

Conversation

GovanifY
Copy link
Member

@GovanifY GovanifY commented Aug 26, 2020 •
edited

Motivation for this change

Jinja2 had a missing dependency on setuptools, uncovered while trying to use llvm-cov+gcovr with meson:

Traceback (most recent call last):
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/bin/.gcovr-wrapped", line 9, in <module>
    sys.exit(main())
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/__main__.py", line 253, in main
    print_reports(covdata, options, logger)
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/__main__.py", line 368, in print_reports
    generator(covdata, output.value, options)
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 107, in print_html_report
    data['CSS'] = templates().get_template('style.css').render(
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 36, in __call__
    return self.get()
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 25, in load
    result = fn()
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 46, in templates
    loader=PackageLoader('gcovr'),
  File "/nix/store/2qix64mfl3mw7n76z5ii7plrmms51x2g-python3.8-Jinja2-2.11.2/lib/python3.8/site-packages/jinja2/loaders.py", line 233, in __init__
    from pkg_resources import DefaultProvider
ModuleNotFoundError: No module named 'pkg_resources'
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

samuelgrf and others added 30 commits August 10, 2020 22:47
@samuelgrf
firefox-bin: ffmpeg_3 -> ffmpeg
8bf9101
@liff
nixosTests.virtualbox: Disable predictable interface names in guest
e64e92f
@liff
nixosTests.virtualbox: Port to python
5f5c990
@WilliButz
confluence: 7.6.1 -> 7.7.2
a942508
@Izorkin
nixos/security/misc: add option unprivilegedUsernsClone
e21e5a9
@r-ryantm
fasm: 1.73.24 -> 1.73.25
a4701ba
@j0hax
octoprint: 1.4.0 -> 1.4.2
b1b8cae
@hmenke
nixos/shadowsocks: support plugins
d35cb15
@hmenke
maintainers: add hmenke
ef6c9fb
@hmenke
nixos/shadowsocks: add test
27f281b
@r-ryantm
istioctl: 1.6.7 -> 1.7.0
a45fa65
@danieldk
intel-gmmlib: 20.2.3 -> 20.2.5
25d7d47
@danieldk
intel-compute-runtime: 20.02.15268 -> 20.33.17675
e71aaab
@r-ryantm @FRidh
poedit: 2.3.1 -> 2.4.1
46184ba
@r-ryantm @FRidh
flexibee: 2020.2.1.2 -> 2020.2.3.1
df2317a
@r-ryantm @FRidh
fswebcam: 20140113 -> 20200725
8593feb
@r-ryantm @FRidh
node-problem-detector: 0.8.2 -> 0.8.3
8e6d8fe
@RaghavSood
go-ethereum: 1.9.19 -> 1.9.20
6f7bd51
@flokli
Merge pull request NixOS#94858 from liff/virtualbox-python-test
df2f22d 
nixosTests.virtualbox: Port to python
@RaghavSood
go-ethereum: Add RaghavSood to maintainers
f222501
@gebner
Merge pull request NixOS#96294 from j0hax/octoprint-update
5df3339 
Octoprint: 1.4.0 -> 1.4.2
python3Packages.pipx: init at 0.15.5.0
4a19316
@danieldk
Merge pull request NixOS#95868 from danieldk/icr-update
7b46d0e 
intel-compute-runtime: 20.02.15268 -> 20.32.17625
@WilliButz
Merge pull request NixOS#95847 from WilliButz/update/confluence-7.7.2
1320915 
confluence: 7.6.1 -> 7.7.2
@ImExtends
adding extends to maintainer list
62f394c
@ImExtends
Electron Player: init at 2.0.8
d8f5a66
@r-ryantm
libmatroska: 1.6.1 -> 1.6.2
c9dcac1
@Lassulus
Merge pull request NixOS#96253 from ImExtends/electronplayer
bd37bc5 
Electron player: init at 2.0.8
@roberth @FRidh
nixos/nixpkgs.nix: Correct crossSystem default literal
4d43de3 
The default is null and the documentation should reflect that.
@zowoq
.github/workflow/pending-{set,clear}: switch to curl
64a2de1
primeos and others added 11 commits August 26, 2020 14:30
@primeos
chromiumDev: Drop the optional VA-API patches
bf0e13a 
I didn't look into this yet but IIRC M86 will finally have a flag for
Linux to enable VA-API. So we shouldn't need
enable-video-acceleration-on-linux.patch anymore.

But we likely need to update enable-vdpau-support-for-nvidia.patch
when/before M86 hits the stable channel if we want to keep VDPAU
support.
@primeos
chromiumDev: Fix "patchShebangs ."
8815c9e 
Note: The following might also need to be updated:
substituteStream(): WARNING: pattern '/usr/share/xcb' doesn't match anything in file 'ui/gfx/x/BUILD.gn'
@adisbladis
Merge pull request NixOS#96343 from RaghavSood/ethereum/1.9.20
06abd5c 
go-ethereum: 1.9.19 -> 1.9.20
@adisbladis
Merge pull request NixOS#95113 from samuelgrf/update/firefox-bin-ffmpeg
5f464fc 
firefox-bin: ffmpeg_3 -> ffmpeg
@r-ryantm
gerrit: 3.2.2 -> 3.2.3 (NixOS#96304)
1d8caa0
@danieldk
Merge pull request NixOS#96358 from r-ryantm/auto-update/libmatroska
8d819fb 
libmatroska: 1.6.1 -> 1.6.2
@danieldk
Merge pull request NixOS#96307 from r-ryantm/auto-update/fasm
4ef21bb 
fasm: 1.73.24 -> 1.73.25
@ryantm
Merge pull request NixOS#96334 from r-ryantm/auto-update/istioctl
23a00dc 
istioctl: 1.6.7 -> 1.7.0
@joachifm
Merge pull request NixOS#96080 from Izorkin/unprivileged-userns-clone
1ad014b 
nixos/security/misc: add option unprivilegedUsernsClone
@Lassulus
Merge pull request NixOS#96127 from hmenke/shadowsocks
12baef5 
shadowsocks service: support plugins
@GovanifY
jinja2: fix dependencies
e2ec55a
@FRidh
Copy link
Member

FRidh commented Aug 26, 2020

I feared so, this needs to target staging.

@GovanifY
Copy link
Member Author

@FRidh Should I change the branch of the PR?

@GovanifY GovanifY changed the base branch from master to staging August 26, 2020 15:51
@GovanifY
Copy link
Member Author

Argh, let me rebase the commit and reopen the PR

@GovanifY GovanifY closed this Aug 26, 2020
@GovanifY GovanifY mentioned this pull request Aug 26, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh approved these changes

@jonringer jonringer Awaiting requested review from jonringer

@joachifm joachifm Awaiting requested review from joachifm joachifm is a code owner

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@mmahut mmahut Awaiting requested review from mmahut mmahut is a code owner

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet