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: 892407a9c671
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: bef2a439576b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 29, 2018

  1. beets: Add patch to fix Python 3.7 compatibility

    Since 0f38d96, the default Python
    version for Python 3 is now Python 3.7.
    
    It has been a while since beets had a new release, but the fix for
    Python 3.7 is already in master (and it's also rather small), so I
    decided to cherry-pick the commit as a patch.
    
    I've built the package along with its tests and they failed at first,
    but the errors were unrelated. So I disabled the tests for pylint, as
    they're failing right now.
    
    In addition I also needed to temporarily revert
    0d2f06a, which supposedly should fix
    issues with Python 2 but aparently breaks Python 3 support and during
    the beets tests we get a ModuleNotFoundError for the "_gi_gst" module.
    
    However I didn't further investigate why this happens, as I'm time
    constrained right now. But after disabling the pylint tests and the
    revert of the mentioned gst-python commit, the beets tests succeed.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Cc: @jtojnar, @lopsided98 (for introducing the gst-python change)
    Cc: @domenkozar, @pjones (other beets maintainers)
    aszlig committed Nov 29, 2018
    2
    Copy the full SHA
    36efeac View commit details
    Browse the repository at this point in the history
  2. beets-alternatives: 0.8.2 -> 0.9.0

    This introduces the following upstream changes:
    
      * The package is now on PyPI
      * Require at least beets v1.4.7
      * Update album art in alternatives when it changes
      * Python 3 support (Python 2.7 continues to be supported)
      * Support the format aliases defined by the convert plugin ('wma' and
        'vorbis' with current beets)
      * Bugfix: Explicitly write tags after encoding instead of relying on
                the encoder to do so
      * Bugfix: If the formats config option is modified, don't move files
                if the extension would change, but re-encode
    
    I updated this because I was pinged by @wisp3rwind about moving back to
    @geigerzaehler's repository at [1].
    
    This is what @wisp3rwind wrote in the comment[2] (which was originally
    directed to @Profpatsch):
    
      (I hope you're the one to bug, or at least can ping someone else), I
      just noticed that you switched the NixOS package to my repository.
      Would you please switch it back to this repo soon-ish? The code here
      is better tested, and [3] is handled less elegantly on my fork since
      it requires changes to the configuration. The latter are undocumented,
      but whoever has bothered to take a look at the code might end up with
      (harmless) unused config entries.
    
    So in essence we're now back to the original upstream repository again,
    which I changed to @wisp3rwind's fork in 29e8924
    because it fixed issues with Python 3.
    
    Stripping the long_description from setup.py also doesn't seem to be
    required anymore, but I didn't investigate why (might be because either
    our Python tooling now sets a default language or the README simply no
    longer has non-ASCII characters).
    
    [1]: https://github.com/geigerzaehler/beets-alternatives
    [2]: geigerzaehler/beets-alternatives#23
    [3]: geigerzaehler/beets-alternatives#27
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Nov 29, 2018
    Copy the full SHA
    887ae75 View commit details
    Browse the repository at this point in the history
  3. beets-alternatives: Add myself as maintainer

    I've introduced the plugin and have been maintaining it ever since, so
    it's time to make myself the official maintainer in order to avoid
    confusion about who to address when issues about the alternatives plugin
    arise.
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Cc: @wisp3rwind
    aszlig committed Nov 29, 2018
    Copy the full SHA
    bef2a43 View commit details
    Browse the repository at this point in the history