1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-12 23:55:23 +00:00
Commit graph

98 commits

Author SHA1 Message Date
aszlig 0d5ff13701
beets: Merge pull request #15165: Fix ffmpeg call
This patches the ffmpeg command path so that it will work without ffmpeg
being in the user's current path. The commit contains a suggestion from
me to patch command_output() instead of just replacing "ffmpeg" so that
if a user configuration alters the default commands it will still work.
2016-05-02 18:56:19 +02: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
José Romildo Malaquias d3c29a4140 pnmixer: 2014-07-24 -> 2016-04-23 2016-04-29 20:11:15 -03:00
Emery Hemingway 79a215e78d dir2opus: 0.12.1 -> 0.12.2 2016-04-25 20:20:20 +02:00
Franz Pletz 76fc67a083 darkice: Fix build due to multiple outputs 2016-04-24 17:41:08 +02:00
Vladimír Čunát e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Nikolay Amiantov a3a40c027c qastools: move to qmake4Hook 2016-04-20 18:55:55 +03:00
Peter Hoeg 7cdf23a1f5 aucdtect: init at 0.8.2
A binary distribution of the TA Analyzer that verifies if audio files
are in fact lossless.
2016-04-20 23:42:41 +08:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Micxjo Funkcio 0c059b4973
playerctl: 0.4.2 -> 0.5.0 2016-04-04 17:47:35 -07:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Emery Hemingway 174d5eac35 acoustidFingerprinter: fix taglib version check 2016-03-17 11:15:53 +01:00
Nicolas B. Pierron 72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00: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 40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Brian McKenna 4ec4666762 playerctl: init at 0.4.2 2016-02-22 18:09:56 +11: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
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Charles Strahan b6c06e216b ruby: new bundler infrastructure
This improves our Bundler integration (i.e. `bundlerEnv`).

Before describing the implementation differences, I'd like to point a
breaking change: buildRubyGem now expects `gemName` and `version` as
arguments, rather than a `name` attribute in the form of
"<gem-name>-<version>".

Now for the differences in implementation.

The previous implementation installed all gems at once in a single
derivation. This was made possible by using a set of monkey-patches to
prevent Bundler from downloading gems impurely, and to help Bundler
find and activate all required gems prior to installation. This had
several downsides:

* The patches were really hard to understand, and required subtle
  interaction with the rest of the build environment.
* A single install failure would cause the entire derivation to fail.

The new implementation takes a different approach: we install gems into
separate derivations, and then present Bundler with a symlink forest
thereof. This has a couple benefits over the existing approach:

* Fewer patches are required, with less interplay with the rest of the
  build environment.
* Changes to one gem no longer cause a rebuild of the entire dependency
  graph.
* Builds take 20% less time (using gitlab as a reference).

It's unfortunate that we still have to muck with Bundler's internals,
though it's unavoidable with the way that Bundler is currently designed.
There are a number improvements that could be made in Bundler that would
simplify our packaging story:

* Bundler requires all installed gems reside within the same prefix
  (GEM_HOME), unlike RubyGems which allows for multiple prefixes to
  be specified through GEM_PATH. It would be ideal if Bundler allowed
  for packages to be installed and sourced from multiple prefixes.
* Bundler installs git sources very differently from how RubyGems
  installs gem packages, and, unlike RubyGems, it doesn't provide a
  public interface (CLI or programmatic) to guide the installation of a
  single gem. We are presented with the options of either
  reimplementing a considerable portion Bundler, or patch and use parts
  of its internals; I choose the latter. Ideally, there would be a way
  to install gems from git sources in a manner similar to how we drive
  `gem` to install gem packages.
* When a bundled program is executed (via `bundle exec` or a
  binstub that does `require 'bundler/setup'`), the setup process reads
  the Gemfile.lock, activates the dependencies, re-serializes the lock
  file it read earlier, and then attempts to overwrite the Gemfile.lock
  if the contents aren't bit-identical. I think the reasoning is that
  by merely running an application with a newer version of Bundler, you'll
  automatically keep the Gemfile.lock up-to-date with any changes in the
  format. Unfortunately, that doesn't play well with any form of
  packaging, because bundler will immediately cause the application to
  abort when it attempts to write to the read-only Gemfile.lock in the
  store. We work around this by normalizing the Gemfile.lock with the
  version of Bundler that we'll use at runtime before we copy it into
  the store. This feels fragile, but it's the best we can do without
  changes upstream, or resorting to more delicate hacks.

With all of the challenges in using Bundler, one might wonder why we
can't just cut Bundler out of the picture and use RubyGems. After all,
Nix provides most of the isolation that Bundler is used for anyway.

The problem, however, is that almost every Rails application calls
`Bundler::require` at startup (by way of the default project templates).
Because bundler will then, by default, `require` each gem listed in the
Gemfile, Rails applications are almost always written such that none of
the source files explicitly require their dependencies. That leaves us
with two options: support and use Bundler, or maintain massive patches
for every Rails application that we package.

Closes #8612
2015-12-29 09:30:21 -05: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
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Emery Hemingway 2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +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
Franz Pletz ed13d23c97 darkice: Fix build with opus and vorbis support
The configure script requires libogg in both the paths of libopus and
libvorbis. Because is isn't true for the libopus and libvorbis
derivations in NixOS and patching the configure script is a bit tedious,
a temporary environment with libogg, libvorbis & libopus is used.
2015-10-23 14:09:50 +02:00
Vladimír Čunát 1fdbc3097b alsa-lib: split "dev" output and fix referrers 2015-10-13 20:18:55 +02:00
Vladimír Čunát 1f73d482d6 beets: fix tarball evaluation by asserting isLinux
/cc #10069.
2015-09-26 09:29:49 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
koral d3723b300e beets: 1.3.13 -> 1.3.14 2015-08-30 18:34:10 +00:00
William A. Kennington III 7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
Arseniy Seroka 70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
codyopel dd6946dcbb beets: 1.3.11 -> 1.3.13 2015-05-31 23:51:04 -04:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
lethalman af4d6468b2 Merge pull request #7959 from ikervagyok/darkice
New Package: Darkice
2015-05-27 10:51:59 +02:00
Lengyel Balázs aa1ce46281 Inital commit for Darkice 2015-05-26 15:20:53 +02:00
Michael Alan Dorman 1a4c952422 And now try fetchFromGitHub 2015-05-25 17:13:37 -04:00
Michael Alan Dorman e81c6bd654 Use fetchzip to retrieve new pasystray. 2015-05-25 17:13:37 -04:00
Michael Alan Dorman bc1b8cb33a Update pasystray to current version. 2015-05-25 17:13:37 -04:00
Michael Alan Dorman fb655dce4c Fix SHA for pasystray.
I presume there's something about how github creates the .zip files such
that they can change SHA.

Please note: this is a very outdated version of pasystray---I don't know
if that's intentional, but perhaps a better strategy would be to update
it wholesale.
2015-05-25 17:13:37 -04:00
Peter Jones 05a6c34e04 New package: mpDris2, MPRIS 2 support for mpd 2015-05-20 15:37:25 -06:00
Arseniy Seroka b28d29ba0b fix missing argument 2015-05-19 21:09:34 +03:00