Commit graph

61 commits

Author SHA1 Message Date
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
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
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
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
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
Frederik Rietdijk
599312739e beets: use python2 2016-11-24 22:28:03 +01:00
Frederik Rietdijk
104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Robert Helgesson
e8817a2d20
bash-completion: change attribute name
This changes the attribute name of bash-completion from `bashCompletion`
to `bash-completion`. Keeps `bashCompletion` as an alias for the new
name.
2016-09-28 17:46:29 +02:00
aszlig
900a04e6c9
beets: Use pythonPackages.buildPythonApplication
The top-level attribute has been removed in commit
771ed59b48.

This has been partially resolved in commit
18bdd44729.

The latter change however only addressed the main derivations but missed
out on the plugins. This is now done by just passing pythonPackages down
the chain.

Tested by only evaluating the expression, not building.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar, @pjones, @profpatsch
2016-09-27 00:07:45 +02:00
Frederik Rietdijk
18bdd44729 beets: pass in pythonPackages 2016-09-26 11:10:50 +02:00
Michal Rus
328180bc2f
beets: fix keyfinder plugin by addind keyfinder-cli dependency 2016-09-10 01:44:10 +02:00
Michal Rus
37a61d357a
beets: add copyartifacts plugin 2016-09-10 01:43:42 +02:00
Bjørn Forsman
b1882ad395 beets: 1.3.17 -> 1.3.19
The echonest plugin was removed in 3.18 because the API it used is
shutting down. You might want to try the acousticbrainz instead.

Update pluginsWithoutDeps as needed to keep preCheck working.
2016-08-02 12:28:53 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Profpatsch
1a350e6b58 beets: patch ffmpeg invocation in convert plugin
The default convert configuration invokes ffmpeg, so this patches in the
right storepath. Since it patches the shlex split, even user config will
use the correct path. kudos @aszlig.
2016-05-02 18:39:46 +02:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
aszlig
b6595185f6
beets: Re-enable tests
The reason why the completion tests didn't pass was because we had it
already disabled in 2acc258dff.

Meanwhile, beetbox/beets@a07cb83 has moved the file from
test/test_completion.sh to test/rsrc/test_completion.sh.

So this has silently re-enabled the completion tests, which we need to
investigate on our side why they failed in the first place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-10 02:41:15 +01:00
Profpatsch
22818c6ec4 beets: 1.3.16 -> 1.3.17
one test fails, see the source comment
2016-02-09 21:43:50 +01:00
Profpatsch
1a6c03c234 beets: 1.3.15 -> 1.3.16
Add plugins embyupdate, edit, mbsubmit as plugins.
2016-02-02 18:50:55 +01:00
Tuomas Tynkkynen
76cfa449dc treewide: Mass replace 'flac}/bin' to refer the 'bin' output 2016-02-01 20:46:02 +02:00
aszlig
662ab05119
beets: Add the external beets-alternatives plugin
It's not included in upstream beets but are linked in the documentation
under "Other plugins", see:

http://beets.readthedocs.org/en/v1.3.15/plugins/index.html#other-plugins

I found this one particularly useful for syncing files to varios media
players that refuse to read my FLAC files properly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-18 05:58:27 +01:00
aszlig
68c504fa8f
beets: Use bs1770gain by default for replaygain
After trying with a dozen files, it seems the bs1770gain backend is much
more reliable than the audiotools backend and especially does a better
job (well, compared to audiotools which either does doing nothing at all
or throws an exception) when used on alboms that contain different
sample rates/sizes.

Additionally, we already had a few issues regarding the audiotools
backend, even to the extent that @sampsyco almost wanted to drop it
upstream (see sampsyco/beets#1342).

Also related issues are #10376 and sampsyo/beets#1592.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-18 05:58:27 +01:00
aszlig
f864ef703e
beets: Add dependencies for "badfiles" plugin.
I have to admit that I did very poor testing in d7307d8 and didn't
notice that the "badfiles" plugin relies on mp3val (thanks to @devhell
for packaging in 6e1ef13) and flac to be actually useful.

We now patch in the store locations of these binaries and make
"badfiles" an optional dependency (though enabled by default).

Now, I have tested "beet bad" on my whole music collection and it worked
fine (well, it has found errors... but that's what it is for).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-26 10:26:48 +01:00
aszlig
d7307d8e80
beets: 1.3.14 -> 1.3.15
Introduces a new plugin called "badfiles", which helps to scan for
corruption within the music collection. I've added this to
pluginsWithoutDeps and sorted the list.

Full upstream changelog can be found here:

https://github.com/sampsyo/beets/releases/tag/v1.3.15

This fixes #10376 via sampsyo/beets@225ba28.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-25 18:39:46 +01:00
Vladimír Čunát
1f73d482d6 beets: fix tarball evaluation by asserting isLinux
/cc #10069.
2015-09-26 09:29:49 +02:00
koral
d3723b300e beets: 1.3.13 -> 1.3.14 2015-08-30 18:34:10 +00:00
codyopel
dd6946dcbb beets: 1.3.11 -> 1.3.13 2015-05-31 23:51:04 -04:00
aszlig
17ea86d947
beet: Remove unnecessary "LANG = null".
We're passing glibcLocales to the tests directly, so we don't pollute
the builder's environment anyway, so no reason to override anything
there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-14 09:45:18 +02:00
aszlig
642b8ae658
boots: Sort expression strings/attributes.
I know, I know, this is me being ultra-nazi about those things, but
beets is about OCDing your music collection, so why not apply this to
the Nix expressions as well?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-14 09:45:18 +02:00