Commit Graph

87 Commits

Author SHA1 Message Date
Bernardo Meurer
642fd85cb6
beets: unstable-2020-12-22 -> unstable-2021-01-29 2021-01-31 18:27:56 -08:00
Bernardo Meurer
8094392757
beets: use unstableGitUpdater 2021-01-31 18:27:37 -08:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Austin Butler
1e72aa1feb beats: fix missing lib in extrafiles plugin 2021-01-16 19:15:03 -08:00
Ben Siraphob
8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Bernardo Meurer
cea2b9eff4 beets: add doronbehar to maintainers 2021-01-03 14:36:54 +02:00
Bernardo Meurer
264b77f005 beets: add lovesegfault to maintainers 2021-01-03 14:36:54 +02:00
Bernardo Meurer
0faf72a557 beets: 1.4.9 -> unstable-2020-12-22
The maintainer has stopped cutting releases[1]. Since the last release,
1.4.9, includes a dependency that is filled with hate speech[2] it's all
the more reason to package the unstable version and eliminate that
requirement.

Moreover a number of fixes, improvements, and features have landed
since.

[1]: https://github.com/beetbox/beets/issues/3625
[2]: https://github.com/NixOS/nixpkgs/pull/90504

Co-authored-by: Doron Behar <doron.behar@gmail.com>
2021-01-03 14:36:53 +02:00
Austin Butler
5d365404ac beets: add extrafiles plugin 2020-09-21 10:33:10 +03:00
Doron Behar
7efe1cfe51 beets: Fix wavpack mediafile test
Extend mutagen-1.43.patch to include a fix for now supported bitrate of
wavpack files. See
d2fc3b59f7
for upstream's version of the change.
2020-09-01 09:22:03 +03:00
Martin Weinelt
d55276d7c6
beets: apply patch to fix incompatibilites with python 3.8
https://github.com/beetbox/beets/pull/3621
https://github.com/python/cpython/pull/20649
2020-08-07 00:45:40 +02:00
Martin Weinelt
a9422ba768 beets: fix werkzeug testcases
Closes #91131
2020-06-20 15:12:57 -07:00
Doron Behar
01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Doron Behar
9c3be05166 beets: Quote homepage url 2020-03-25 15:27:55 +02:00
Doron Behar
befbb792b9 pythonPackages.beets: add unconditionally deps needed for checks 2020-03-25 00:21:57 +02:00
Aluísio Augusto Silva Gonçalves
e79af471e7 beets: Fix test to work with mutagen>=1.43 2020-02-14 21:17:38 -08:00
Bernardo Meurer
171ceb38ff
beets.externalPlugins.check: init at 0.12.0 2019-12-14 21:52:21 -08:00
Bernardo Meurer
82b0f7432e
beets: fix absubmit deps 2019-11-17 22:33:26 -08:00
Bruno Bigras
239aafea69 beets: 1.4.7 -> 1.4.9 2019-09-23 00:23:56 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk
2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00
Jörg Thalheim
dadc7eb329
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
2019-02-26 14:10:49 +00:00
Robert Schütz
5124cf7a14 beets: use checkInputs 2019-02-20 20:07:21 +01:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
aszlig
bef2a43957
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
2018-11-29 05:10:17 +01:00
aszlig
887ae75eb2
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 29e89248bf
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]: https://github.com/geigerzaehler/beets-alternatives/issues/23
[3]: https://github.com/geigerzaehler/beets-alternatives/pull/27

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-29 05:10:15 +01:00
aszlig
36efeac21a
beets: Add patch to fix Python 3.7 compatibility
Since 0f38d9669f, 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
0d2f06ae3a, 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)
2018-11-29 05:10:13 +01:00
aszlig
29e89248bf
beets: Fix building plugins with Python 3
Since the switch to using python3Packages in commit
72934aa94e, the plugins no longer build
because they end up with a mix of Python 2 and Python 3 packages.

The reason for this is that the Beets package itself uses callPackage to
reference the plugins, however the overrides are not applied there and
thus the plugins end up getting pythonPackages from the top-level which
is Python 2 and beets with Python 3 dependencies.

Unfortunately this is not the only reason for the builds to fail,
because both plugins did not actually support Python 3.

For the copyartifacts plugin, the fix is rather easy because we only
need to advance to two more recent commits from upstream, which already
contain fixes for Python 3.

The alternatives plugin on the other hand is not maintained anymore, but
there is a fork at https://github.com/wisp3rwind/beets-alternatives
which has a bunch of fixes. In 2e4aded366
I already backported one of these fixes to the version from
https://github.com/geigerzaehler/beets-alternatives, but for Python 3
support it's a bit more complicated than just one little fix.

So instead of adding another series of patches which replicate the code
base of the fork and become a maintenance burden, I opted to directly
switch to the fork and remove the patch on our side.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @domenkozar, @pjones, @Profpatsch
2018-08-02 01:41:36 +02:00
Robert Schütz
72934aa94e beets: use python3Packages 2018-07-26 12:43:18 +02:00
aszlig
9037f608ae
beets: 1.4.6 -> 1.4.7
The upstream release notes are a bit bigger, so I'm not including it
here. You can find it at:

https://github.com/beetbox/beets/releases/tag/v1.4.7

Originally I wanted to just fix the build, which is currently broken
because a few tests have failed, but the fix for the tests is already
included in the 1.4.7 upstream release[1], so I opted to update instead.

Other than running the tests included in beets (in addition to
building/running tests of the "alternatives" and "copyartifacts"
external plugins) I have made some small queries on my local music
collection, but haven't tested import or any write operation.

[1]: https://github.com/beetbox/beets/commit/8eb50fee33044dea008408423ee

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @domenkozar, @pjones
2018-06-29 21:29:49 +02:00
Johannes Frankenau
836be60200 beets: install zsh completion 2018-05-13 21:33:56 +02:00
Profpatsch
2922bee722 remove profpatsch from maintainer list of a few packages 2018-02-12 06:24:38 +01:00
aszlig
2e4aded366
beets-alternatives: Fix tests against beets 1.4.6
Since the bump of beets to version 1.4.6 in e5fab33efd
the tests no longer run successfully because beets 1.4.6 introduces a
breaking API change for the Item.move() method which now instead of just
passing copy=True the operation is now passed using a different
"operation" keyword argument.

Unfortunately the original repository of beets-alternatives is
unmaintained since 3 years and thus there is no upstream fix available
at the moment.

However, there is a fork maintained by @wisp3rwind, which addresses this
problem (wisp3rwind/beets-alternatives@33c6525ed4)
and a bunch of other fixes.

The reason why I'm not using the patch from @wisp3rwind is that it
simply doesn't apply against beets-alternatives 0.8.2, but my patch here
essentially does the same.

Signed-off-by: aszlig <aszlig@nix.build>
Upstream issue: geigerzaehler/beets-alternatives#13
Cc: @Profpatsch
2018-01-31 04:39:21 +01:00
Gabriel Ebner
3d3acfaf27 beets: ignore failing tests
The unidecode 1.0.22 release changed the asciification slightly.
2018-01-27 10:48:31 +01:00
Frederik Rietdijk
e5fab33efd beets: 1.4.5 -> 1.4.6 2018-01-01 12:55:18 +01:00
aszlig
40b76c8809
beets: Run tests for external plugins
In order to run the tests for the external plugins of beets, we need to
have beets itself as a dependency. So in order to do that, we now pass
beets without plugins and tests to the nativeBuildInputs of the plugins
so that we can run them.

As soon as the plugins are built they become part of the final beets,
which also has tests enabled, so disabling the tests for beets
derivation that is used for external plugin tests is a non-issue here
because they're going to be executed anyway.

Enabling tests for the alternatives plugin is pretty straightforward,
but in order to run tests for the copyartifacts plugin, we need to bump
the source code to the latest Git master.

The reason for this is that the version that was in use until now
required to have the beets source directory alongside of the
copyartifacts source code, but we already have beets available as a
normal dependency.

Updating copyartifacts to latest master largely consists of unit test
changes and a few Python 3 compatibility changes. However, one change
has the biggest stat, which is
sbarakat/beets-copyartifacts@1a0c281da0.

Fortunately, the last change is just moving the implementation to a
newer API from upstream beets and by the looks of the implementation it
seems to break support for moving files. However, reverting this commit
also reveals that moving files was already broken before, so it wouldn't
matter much whether we have this version bump or not.

Tested with the following command:

nix-build -E '(import ./. {}).beets.override {
  enableAlternatives = true;
  enableCopyArtifacts = true;
}'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar, @pjones, @Profpatsch, @michalrus
2017-09-02 02:36:32 +02:00
aszlig
bd2aeb4883
beets-alternatives: Disable test suite for now
Regression introduced by 94351197cd.

Running the tests results in the following traceback:
  ...
  File ".../unittest/loader.py", line 91, in loadTestsFromName
    module = __import__('.'.join(parts_copy))
  File ".../test/regrtest.py", line 184, in <module>
    for module in sys.modules.itervalues():
RuntimeError: dictionary changed size during iteration

The reason for this is that the test directory itself is called "test"
and the package including regrtest.py is also called "test", so the
loader tries to load tests from its own implementation.

We could fix this by changing PYTHONPATH and/or making the test
directory a proper package, but we'd still have failing tests because
beets itself is required to run the tests.

However for now I'm just removing the unit_tests kwarg in setup.py so
that we have the same behaviour as before the initially mentioned
commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-09-02 02:36:28 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Johannes Frankenau
ce782c5807 beets: 1.4.3 -> 1.4.5 2017-06-29 10:38:10 +02:00
Profpatsch
79dd4deda5 Ultrastar (#26524)
* ultrastardx-beta: init at 1.3.5

* libbass, libbass_fx: init at 24

* ultrastar-creator: init at 2017-04-12

* buildSupport/plugins.nix: add diffPlugins

Helper function to compare expected plugin lists to the found plugins.

* ultrastar-manager: init at 2017-05-24

The plugins are built in their own derivations, speeding up (re-)compilation.
The `diffPlugins` function from `beets` is reused to test for changes in the
plugin list on updates.

* beets: switch to diffPlugins

The function is basically just extracted for better reusability.
2017-06-14 11:29:31 +02:00
Frederik Rietdijk
ef4442e827 Python: replace requests2 with requests tree-wide
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
2017-05-07 12:56:09 +02:00
Michael Alan Dorman
dc19ba7bc6 beets: enable gstreamer support
So this was suggested as [long ago as October, 2015](https://github.com/NixOS/nixpkgs/issues/10376#issuecomment-147734898).

Despite being fairly ignorant of the nix Python support, I decided
that I really wanted this; this change brings in what I believe are
the necessary components---I have, at least, successfully run `beet
replaygain` and `beet bpd`---but it may not do it in the best way; I'm
happy to consider input on that front.

I can at least state that all three changes are necessary---leave any
one of them out and gstreamer support doesn't work.
2017-02-20 11:44:48 +01:00
Franz Pletz
883f44936d
beets: 1.4.1 -> 1.4.3 2017-01-10 07:45:19 +01:00
Frederik Rietdijk
462a63bb1e beets: add missing dependency six, fixes #20946 2016-12-06 16:48:56 +01:00
aszlig
1f9cbcd21d
beets: Set Python version via top-level attribute
This largely reverts commit 599312739e.

The main reason is that it breaks the plugins, because the mentioned
commit didn't change the attributes for the plugins as well.

But instead of just fixing the attributes when we import the plugin
packages, let's just override pythonPackages in all-packages.nix.

Right now, Beets is in transition to Python 3, so we don't need to wait
that long until we can remove the dependency on Python 2:

https://github.com/beetbox/beets/releases/tag/v1.4.1

Once Python 3 support is no longer beta, we can just change this by
changing one line only instead of several.

Tested this by building beets with both external plugins.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @FRidh
2016-12-03 05:25:13 +01:00
Tuomas Tynkkynen
8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
aszlig
83410d9954
beets: 1.3.19 -> 1.4.1
Full upstream release announcement:

https://github.com/beetbox/beets/releases/tag/v1.4.1

I had to rebase the keyfinder-default-bin.patch in order to apply with
the new release.

Other than that I didn't test whether beets works on my machine, as I
have a more or less temporary setup at the moment.

However, since the bump of mutagen to version 1.34 in commit
555928c228, the mediafile tests fail and
thus this commit unbreaks beets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-11-28 08:58:08 +01:00