Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 8072b0975468
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1035f7259fe1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 22, 2020

  1. s-tui: migrate to python3 

    Includes LC_ALL = "en_US.UTF-8"; that resolves a locale.Error exception
during the check phase.

[...]
  File "/build/s-tui-1.0.0/s_tui/sensors_menu.py", line 27, in <module>
    import urwid
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/__init__.py", line 26, in <module>
    from urwid.widget import (FLOW, BOX, FIXED, LEFT, RIGHT, CENTER, TOP, MIDDLE,
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/widget.py", line 27, in <module>
    from urwid.util import (MetaSuper, decompose_tagmarkup, calc_width,
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/util.py", line 61, in <module>
    detected_encoding = detect_encoding()
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/util.py", line 58, in detect_encoding
    locale.setlocale(locale.LC_ALL, initial)
  File "/nix/store/ja04f3cmapzb3f2mvjrb883bfqclsirq-python3-3.7.6/lib/python3.7/locale.py", line 608, in setlocale
    return _setlocale(category, locale)
locale.Error: unsupported locale setting
    @mweinelt
    mweinelt committed Feb 22, 2020
    Copy the full SHA
    cf0e6a4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #80628 from mweinelt/pr/s-tui 

    s-tui: migrate to python3
    @infinisil
    infinisil committed Feb 22, 2020
    Copy the full SHA
    1035f72 View commit details
    Browse the repository at this point in the history