Commit graph

565 commits

Author SHA1 Message Date
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Jos van den Oever
8a4ce8cf34 Add MuseScore 1.3. 2014-09-12 16:52:44 +02:00
Pascal Wittmann
440d876b54 moc: update from 2.5.0-beta2 to 2.5.0
also set platforms to linux, use default configurePhase and adopt it
2014-09-04 22:29:01 +02:00
Moritz Ulrich
1e543f02df fldigi: update from 3.21.82 to 3.21.83 2014-09-04 19:31:33 +02:00
Michael Raskin
83832944af Merge pull request #3486 from svenkeidel/gpodder
gpodder: Update to 3.8.0
2014-09-03 11:58:03 +04:00
Cillian de Róiste
edbaf9497b zynaddsubfx: 2.4.3 -> 2.4.4 2014-08-31 22:19:04 +02:00
Cillian de Róiste
e728e7cb6d petri-foo: use released version 0.1.87 2014-08-31 22:03:48 +02:00
Cillian de Róiste
3c8ddf7881 lmms: 0.4.15 -> 1.0.3, fix ogg vorbis and fluidsynth support 2014-08-31 21:51:49 +02:00
Peter Simons
45c4e4d04a Merge pull request #3895 from robberer/pkgs/audacious
audacious: update to version 3.5.1
2014-08-31 17:33:01 +02:00
Cillian de Róiste
933bca648f hydrogen: 0.9.5.1 -> 0.9.6 2014-08-31 16:09:44 +02:00
Cillian de Róiste
80da458388 guitarix: fix 0.30.0 build by adding new dependencies 2014-08-31 15:45:27 +02:00
Cillian de Róiste
2bfe0a5d38 guitarix: update from 0.28.3 to 0.30.0 2014-08-31 15:45:14 +02:00
Cillian de Róiste
dcbfff28f3 jalv: update from 1.4.4 to 1.4.6 2014-08-31 15:13:05 +02:00
Longrin Wischnewski
47ebc25c62 audacious: update to version 3.5.1 2014-08-31 13:43:24 +02:00
Vladimír Čunát
3f0ebe7e75 licenses: comment about two versions of MIT
I decided to follow spdx.org and not to differentiate those two.
Packages would often have the wrong version anyway.
2014-08-30 07:28:26 +02:00
Philip Horger
f7aa6e1140 Fix pianobar license to be accurate (MIT)
This was broken, in a well-intentioned way, in 9350c1d. The maintainer
believed that the Pandora license was in conflict with nixpkg's rights
to build the package, and that it would be safer to avoid picking a
fight. However well-intentioned, though, it was still inaccurate and
unnecessary to change the metadata for the package nixexpr. I will
attempt to support this assertion through several arguments that should
hopefully be independent, such that any one of them would be convincing
enough in isolation to merit merging this commit.

1. The limits of Pandora's TOS

The legal agreement between Pandora and its users applies to the user,
not to third parties. It definitely does not have such an outrageous
scope that Pandora should be allowed to dictate what we may or may not
compile.

Furthermore, most TOS and EULA documents are completely (or at least
mostly) legally bunk. They are constructed such that using any website
or software in a typical manner will result in a violation, and the
consequences for violation are then enforced selectively. However,
when such issues go to court, the court regularly favors the user.
Legal precedent generally follows that such agreements are non-binding
scare tactics, rather than enforceable contracts.

2. Most software can be used for evil

If I buy a lockpick kit, it may have a fully open-source hardware
design, be 3D-print-able, etc. And as long as I don't use it to break
into someone else's home, it is perfectly appropriate for me to
manufacture as many copies as I want, and contribute improvements
upstream.

Conversely, if I do misuse the tools, and I am prosecuted, the person
who made the designs available online is *not* responsible for how I
used them.

If we only package things that cannot be used for evil, we'll have to
stop shipping the Linux kernel, and that could make things...
complicated. But it certainly would discourage the NSA from using NixOS.

3. Intent doesn't matter

There was an argument, in channel, that pianobar's intent is entirely
or predominantly illegal. This is not true, as I'll explain shortly,
but I'd first like to explain why intent does not matter.

First of all, intent is subjective. If someone bumps me on the street,
I may infer ill intent. But from the other person's perspective, she's
just in a rush to get from Point A to Point B.

Second, intent is not related to consequences or development
methodology. Ill intent may lead to positive consequences, and vice
versa, and in all cases the subjectivity argument applies (good for
whom? bad for whom?).

4. Pianobar does not have bad intent

Just look at the project page:

    http://6xq.net/projects/pianobar/

The "most important" means of contribution, according to author, is
keeping Pandora alive. In fact, monetary donations of any kind will not
be accepted.

This seems like it's in conflict with one of the most popular features
of the software - an ad-free experience. But pianobar actually has a
better experience when you have a paid Pandora account - higher-quality
streams become available. Pianobar is fully compatible with paid
accounts, and if the developer does not pay for his Pandora account, I
will eat my hat.

Furthermore, a command line client enables more people to use Pandora in
more ways than the stock Pandora client allows. The stock client is
written in Flash, and is slow, resource-hungry, and useless on a
headless server. Pianobar can be used on just about any hardware, and
there are several hardware recipes listed on the project page which
provide straightforward Pandora-based music appliances, using pianobar's
minimal footprint and remote-control-ability.

Because it opens up more use cases and improves the experience for paid
users, it's actually arguable whether pianobar is "bad for Pandora",
when it clearly *could* be the opposite. It is also probably fair to
note that pianobar has been around for awhile, and Pandora has never
expressed an interest in picking a legal fight with it, or even blocking
pianobar from working.

5. Pianobar's source really is MIT-licensed

It is disingenuous to say that pianobar is nonfree. It's absolutely free
software, you can verify the license content against the MIT license
text for yourself. It is developed and distributed as free and open
source software.

The extent of its 'nonfreedom' is that it interacts with a nonfree
service, in ways that the nonfree service may not allow for in their
TOS. To block it on these grounds, would be like blocking Libreoffice
for its Microsoft Word compatibility, or preventing users from visiting
websites that say "this site only for use with IE7".

------------

In summary, we should strive for technical accuracy, rather than
allowing a third-party pseudocontract that does not apply to us, to
dictate what we may or may not package for our users (who may or may not
use it in a way that benefits Pandora).
2014-08-30 07:24:32 +02:00
Sven Keidel
31f015f2e8 gpodder: Update to 3.8.0 2014-08-28 11:25:09 +02:00
Mateusz Kowalczyk
2b54796585 cantata: update to 1.4.1 2014-08-28 00:09:26 +01:00
Emery Hemingway
4fc7e4e10e picard: fix libdisc and acoustid fingerprinting issues
fpcalc is the external fingerprinter, not acoustid-fingerprinter
2014-08-27 13:38:53 +02:00
Cillian de Róiste
6a12b9ab53 yoshimi: update from 1.2.2 to 1.2.3 2014-08-26 14:57:22 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Mateusz Kowalczyk
0f2d101975 cantata: update to 1.4.0 2014-08-24 12:19:06 +02:00
System administrator
08e4d58600
picard: Fix acoustid-fingerprinter binary path.
Signed-off-by: System administrator <robberer@freakmail.de>
Merges and closes pull request #3717.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-22 09:05:34 +02:00
Thomas Tuegel
d3cdf16079 clementine: version bump 1.2.1 -> 1.2.3 (close #3570)
@vcunat: fix hydraPlatforms type (list nestedness), enableParallelBuilding.
2014-08-14 20:35:40 +02:00
Rickard Nilsson
4ddc38f50a mopdiy-moped: Update from 0.3.1 to 0.3.3 2014-08-13 12:03:03 +02:00
Rickard Nilsson
3553798cfb mopdiy: Update from 0.19.0 to 0.19.3 2014-08-13 12:02:34 +02:00
Luca Bruno
d4e20aa3d2 lastwatch: unsupported on darwin due to inotify 2014-08-10 11:50:43 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Vladimír Čunát
1b169722a3 Merge branch 'x-updates'
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
Cillian de Róiste
2702cedb53 yoshimi: update from 1.2.0 to 1.2.2 2014-08-02 11:31:30 +02:00
Cillian de Róiste
e29021d502 qtractor: update from 0.6.1 to 0.6.2 2014-08-02 11:30:57 +02:00
Cillian de Róiste
b67c978540 samplv1: update from 0.4.2 to 0.5.0 2014-08-02 11:30:46 +02:00
Cillian de Róiste
49f26425f9 synthv1: update from 0.4.2 to 0.5.0 2014-08-02 11:30:33 +02:00
Cillian de Róiste
664a4cb18f drumkv1: update from 0.4.2 to 0.5.0 2014-08-02 11:29:23 +02:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Pascal Wittmann
3e35b46519 Merge pull request #3413 from svenkeidel/gtkpod
version bump gtkpod from 1.0.0 to 2.1.4
2014-07-31 13:26:37 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Sven Keidel
6a7d82d000 added meta information 2014-07-31 00:49:14 +02:00
Sven Keidel
2d31046a40 gtkpod: bump to 2.1.4 2014-07-31 00:41:17 +02:00
Bjørn Forsman
18b27cf2e3 ardour: install a desktop file
I based it on the desktop file from Arch Linux.
2014-07-29 18:31:21 +02:00
Georges Dubus
938cd64a6a spotify: Fixed sha for i686 2014-07-29 14:01:39 +02:00
Rickard Nilsson
2b8b29c3dd spotify: Update from 0.9.10.17 to 0.9.11.27 (x86_64) 2014-07-29 11:56:29 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Rickard Nilsson
ccc22bb662 New package: mopidy-moped, a web client for the mopidy music player daemon 2014-07-28 19:51:08 +02:00
Rickard Nilsson
5b3f2e9a5e mopidy-spotify: Update from 1.1.3 to 1.2.0 2014-07-28 19:49:41 +02:00
Rickard Nilsson
f5905b5fd3 mopdiy: Update from 0.18.3 to 0.19.0 2014-07-28 19:49:10 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Domen Kožar
0cb54d44ca Merge pull request #3256 from 1126/master
ncmpc: updated to version 0.23.
2014-07-27 14:17:56 +02:00
Bjørn Forsman
c8c04841e1 qjackctl: version bump 0.3.10 -> 0.3.11 2014-07-26 17:16:07 +02:00