Commit graph

538 commits

Author SHA1 Message Date
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
Sebastian Korten 620100a406 vimpc: initial install script 2014-07-25 15:32:04 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra a1a3811506 flac: Disable tests
These take a stupid amount of time.
2014-07-23 10:48:27 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Bjørn Forsman 4597903ce9 espeakedit: version bump 1.46.02 -> 1.48.03 (and add to channel)
The one-liner gcc buildPhase doesn't work anymore, so I'm using upstream
Makefile instead. The Makefile needs a tiny patch to work (not nixpkgs
specific).

Also fixup path to 'sox' and espeak-data/ (runtime deps) by providing
full paths.

TODO:
Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even
thought I've told it to use $espeak/share/espeak-data. Have to contact
upstream to get this fixed.

Workaround:
  cp -r $(nix-build -A espeak)/share/espeak-data ~
  chmod +w ~/espeak-data
2014-07-22 21:33:25 +02:00
Bjørn Forsman 62adfd8570 espeak: version bump 1.46.02 -> 1.48.04 (and add to channel) 2014-07-22 21:24:25 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Sven Keidel 4ef371e1f6 added platform meta information to gpodder 2014-07-22 09:39:06 +02:00
Sven Keidel ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
Sven Keidel 75b3c9eb95 Use make install instead of setup.py directly.
Using setup.py results in the following error message:

    Missing file: share/applications/gpodder.desktop

    If you want to install, use "make install" instead of using
    setup.py directly. See the README file for more information.
2014-07-21 18:05:08 +02:00
Sven Keidel 1a484c8ba2 moved wrapper declaration to preFixup 2014-07-21 17:58:27 +02:00
Sven Keidel eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
_1126 3fee3c05b1 ncmpc: updated to version 0.23. 2014-07-14 10:05:41 +02:00
Rickard Nilsson 89a0bf43d1 mopidy: Update from 0.15.0 to 0.18.3
Also add the mopidy-spotify extension.
2014-07-12 09:34:52 +02:00
_1126 daa7f344ae ncmpc: update to version 0.22 2014-07-07 23:51:14 +02:00
Boris Sukholitko 70ad9ad8f9 Add mp3splt 2014-07-07 21:38:14 +03:00
Vladimír Čunát aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Luca Bruno f5eb0f2883 Merge pull request #3052 with some additional changes 2014-06-27 11:38:00 +02:00
Jos van den Oever 6c20d83263 transcode: new package
Suite of command line utilities for transcoding video and audio codecs,
and for converting beween different container formats.

http://www.transcoding.org/
2014-06-27 11:34:29 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát 4e39e578f2 lmms: fix build with freetype-2.5 2014-06-26 21:56:47 +02:00
Bjørn Forsman 654f9e38e6 zynaddsubfx: fix description (capitalize first word) 2014-06-23 13:04:57 +02:00
宋文武 513165fc9a add xmp 4.0.7 2014-06-10 12:07:41 +08:00