Commit Graph

630 Commits

Author SHA1 Message Date
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
Eelco Dolstra
1da6a7d4a9 Remove illegal meta.src attributes 2014-06-05 13:04:18 +02:00
Rickard Nilsson
11ac14f31b spotify: Update from 0.9.4.183.g644e24e.428 to 0.9.10.17.g4129e1c.78 (only for x86_64) 2014-05-30 10:18:39 +02:00
Vladimír Čunát
4c792e58aa ncmpc: another attempt to fix linkage on darwin 2014-05-27 16:55:56 +02:00
_1126
25ea04f2c9 ncmpc: propable fix for x86_64-darwin build error
@vcunat fixed syntax a bit. Close #2761.
2014-05-26 21:35:32 +02:00
Mateusz Kowalczyk
1cbcdd5159 cantata: fix build failure (close #2723)
We were one directory too high for configure.
2014-05-26 21:25:56 +02:00
Bjørn Forsman
97af2620c7 clementine: fix evaluation
$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named `clementine-1.2.1':
while evaluating `optional' at .../lib/lists.nix:113:20, called from .../pkgs/applications/audio/clementine/default.nix:50:22:
undefined variable `not' at .../pkgs/applications/audio/clementine/default.nix:50:32
2014-05-25 20:32:46 +02:00
Domen Kožar
6915bc07b2 Merge pull request #2740 from ttuegel/clementine
clementine: disable unfree dependencies by default
2014-05-25 15:38:22 +02:00
Domen Kožar
908f2f8fe0 Merge pull request #2738 from jagajaga/moc_update
update moc
2014-05-25 15:36:45 +02:00
Thomas Tuegel
0a794b79ca clementine: disable unfree dependencies by default
Clementine has an optional dependency on libspotify, which is unfree.
Enabling libspotify unconditionally prevented Hydra from distributing
Clementine. Now, we optionally enable it based on
config.clementine.spotify.
2014-05-24 18:25:04 -05:00
Cillian de Róiste
b924959648 qtractor: update from 0.6.0 to 0.6.1 2014-05-24 21:11:59 +02:00
Cillian de Róiste
94fd1a83bd ardour3: 3.5.357 -> 3.5.380 Critical bug fix release 2014-05-24 20:42:47 +02:00
Arseniy Seroka
4c45997423 update moc 2014-05-24 22:34:27 +04:00
Cillian de Róiste
056bd4fdba synthv1: update from 0.4.1 to 0.4.2 2014-05-24 15:43:07 +02:00
Cillian de Róiste
2dc6eb3941 samplv1: update from 0.4.1 to 0.4.2 2014-05-24 15:42:32 +02:00
Cillian de Róiste
18df371fe3 drumkv1: update from 0.4.1 to 0.4.2 2014-05-24 15:41:45 +02:00
Austin Seipp
7d16157c87 Merge pull request #2478 from Fuuzetsu/cantata
cantata: create version 1.3.4
2014-05-18 08:25:27 -05:00
Austin Seipp
21cb0c9bbb Merge pull request #2621 from CodeBlock/fldigi
Package hamlib and fldigi; Bump perlPackages.ExtUtilsMakeMaker
2014-05-13 19:45:34 -05:00
Austin Seipp
738622282b Merge pull request #2622 from CodeBlock/minimodem
Add minimodem package
2014-05-13 19:43:52 -05:00
Rickard Nilsson
dd592d7ef3 spotify: Fix missing src url for qt. Add missing dependencies. 2014-05-13 12:04:45 +02:00
Ricky Elrod
6e2fe51190 Add minimodem package
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:44:38 -04:00
Ricky Elrod
0c45c81812 Use name and pname to follow conventions
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:17:12 -04:00
Ricky Elrod
913e340c9a Add fldigi package
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:03:33 -04:00
Cillian de Róiste
68325d8eae setbfree: build the GUI 2014-05-11 12:51:29 +02:00
Mateusz Kowalczyk
a9f85aa4e9 cantata: create version 1.3.4 2014-05-09 03:22:45 +02:00
Cillian de Róiste
7c2c5987d1 Add setBfree a DSP tonewheel organ emulator 2014-05-05 22:57:48 +02:00
Eelco Dolstra
d304b277bd Silence some Hydra evaluation warnings 2014-04-24 15:40:55 +02:00
Eelco Dolstra
dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
Bjørn Forsman
8b666e44fd Unbreak tarball job
Fix undefined variable in pamixer.
2014-04-18 22:48:12 +02:00
_1126
96257ea486 Adding pamixer. 2014-04-18 16:09:34 +02:00
Domen Kožar
6449bc2f23 Merge pull request #2244 from lethalman/gsettings
audacious, sflphone: find gsettings schemas
2014-04-14 09:43:35 +02:00
Luca Bruno
091ce87a00 audacious: find gsettings schemas 2014-04-13 23:30:15 +02:00
Bjørn Forsman
2b9c96878c qmmp: update 0.7.5 -> 0.7.6
Changes since 0.7.5:
 * added libav 10 and ffmpeg 2.2 support;
 * fixed url parsing;
 * fixed freezing on playback resume;
 * fixed random freezing in the mplayer plugin;
 * fixed reset selection of tracks when calling context menu;
 * fixed multimedia keys support under win32.
2014-04-13 19:07:06 +02:00
Cillian de Róiste
02e693c400 synthv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:29 +02:00
Cillian de Róiste
440a174e2d samplv1: update from 0.4.0 to 0.4.1 2014-04-12 11:58:13 +02:00
Cillian de Róiste
aee930586f drumkv1: update from 0.4.0 to 0.4.1 2014-04-12 11:57:43 +02:00
Vladimír Čunát
9bde84a75d fix evaluation since 34301c8 2014-03-27 21:33:25 +01:00
Cillian de Róiste
b60f8810b2 yoshimi: update from 1.1.0 to 1.2.0 2014-03-26 22:27:02 +01:00
Cillian de Róiste
fc4542c99d qtractor: update from 0.5.12 to 0.6.0 2014-03-26 22:26:43 +01:00
_1126
34301c89e1 ncmcp: New expression 2014-03-26 12:15:01 +01:00
Shea Levy
789cbfdced Merge branch 'ekho' of git://github.com/iyzsong/nixpkgs
add ekho 5.8.2, a Chinese TTS software
2014-03-19 18:26:18 -04:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Cillian de Róiste
1661501465 ardour: make ardour3 the default and remove ardour 2, it doesn't build 2014-03-16 11:32:56 +01:00
宋文武
9ce62a1ae6 add vmpk 0.5.1, a virtual midi piano keyboard 2014-03-15 13:13:25 +08:00
Nixpkgs Monitor
b86692e00d mpg123: update from 1.18.1 to 1.19.0 2014-03-14 11:16:56 +01:00
宋文武
aa42830538 add ekho 5.8.2, a Chinese TTS software 2014-03-14 13:18:19 +08:00
Eelco Dolstra
1fe2a68224 quodlibet: Fix evaluation
http://hydra.nixos.org/build/9400950
2014-03-10 14:51:05 +01:00
Cillian de Róiste
12b50bb9f6 add ams-lv2: An LV2 port of the internal modules found in Alsa Modular Synth 2014-03-09 22:14:56 +01:00
Cillian de Róiste
7aa008d1b8 Merge branch 'ingen' 2014-03-09 20:35:20 +01:00
Cillian de Róiste
d21323cbf8 add ingen: A modular audio processing system using JACK and LV2 or LADSPA 2014-03-09 20:32:06 +01:00
Cillian de Róiste
dc80186449 synthv1: update from 0.3.6 to 0.4.0 2014-03-08 14:52:19 +01:00
Cillian de Róiste
c4651ec5df samplv1: update from 0.3.6 to 0.4.0 2014-03-08 14:52:19 +01:00
Cillian de Róiste
3093656cfb drumkv1: update from 0.3.6 to 0.4.0 2014-03-08 14:52:19 +01:00
Domen Kožar
a73ab2f4cf Merge pull request #1893 from ttuegel/maintainer
Claim maintainership of recently added packages
2014-03-07 21:53:12 +01:00
Thomas Tuegel
df5639183c Claim maintainership of recently added packages
Also set platforms for some packages where it was missing.
2014-03-07 11:23:30 -06:00
Song Wenwu
08fb4d6bc4 praat: set meta.platforms to linux 2014-03-07 15:06:44 +01:00
Song Wenwu
1d52f7bd68 praat: update from 5323 to 5365 2014-03-07 15:06:44 +01:00
Peter Simons
43eb9e6d53 mpg123: update from 1.16.0 to 1.18.1 2014-03-03 11:10:25 +01:00
Domen Kožar
e9f3199973 add gstreamer 1.0 setup-hook and use it where appropriate 2014-02-28 02:03:07 +01:00
Cillian de Róiste
f6aba32af3 ardour3: update 3.5.308 -> 3.5.357 2014-02-23 19:14:27 +01:00
Domen Kožar
e65eb02a35 fix eval 2014-02-21 18:38:02 +01:00
Domen Kožar
368839c703 Merge pull request #1467 from iElectric/buildPythonPackage-refactor
buildPythonPackage refactoring
2014-02-21 18:33:48 +01:00
Domen Kožar
f1db57f1fe buildPythonPackage: fix more borken packages 2014-02-21 18:29:57 +01:00
Cillian de Róiste
864c75b7fd guitarix: update from 0.25.2 to 0.28.3
Add new required inputs: lv2 and avahi, tidy up
2014-02-21 00:19:25 +01:00
Domen Kožar
fae6079a01 adopt rest of the packages that were failing with the buildPythonPackage changes 2014-02-20 01:19:15 +01:00
Cillian de Róiste
845f30aa6a sonic-visualiser: upgrade from 1.9 to 2.3
remove obsolete patch, add new inputs
2014-02-19 20:14:15 +01:00
Cillian de Róiste
b532c03fbe ardour3: update from 3.0 to 3.5.308 2014-02-18 21:28:28 +01:00
Evgeny Egorochkin
c67f562d5e add branch info 2014-02-18 04:13:45 +02:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Bjørn Forsman
e6204c8721 qmmp: update 0.7.3 -> 0.7.5 2014-02-13 22:55:57 +01:00
Evgeny Egorochkin
545f5a2f6f amarok: minor cleanup 2014-02-13 04:26:41 +02:00
Petr Rockai
4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Song Wenwu
ef460bd170 puredata: update to 0.45-4
Cf. #1515.
2014-01-26 10:19:19 +01:00
Cillian de Róiste
3ee043da54 pianobooster: patch to build with gcc4.7, wrap it so it finds libGL.so.1
Also add linux as a platform.

Patches from:
https://github.com/gbin/gbin-overlay/tree/master/media-sound/pianobooster
2014-01-25 17:54:57 +01:00
Petr Rockai
251fc454ba mpc: (mpd client) Update to 0.25. 2014-01-25 16:30:14 +01:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Cillian de Róiste
0ec2adc69d mda_lv2: update from 1.0.0 to 1.2.2 2014-01-19 14:59:48 +01:00
Cillian de Róiste
c9d1ed561f lmms: tidy up, fix build 2014-01-19 14:43:05 +01:00
Nixpkgs Monitor
f95dfe1502 lmms: update from 0.4.10 to 0.4.15 2014-01-19 14:43:05 +01:00
Cillian de Róiste
76267063a5 jalv: update from 1.4.2 to 1.4.4 2014-01-19 13:06:51 +01:00
Cillian de Róiste
b3a116c762 zynaddsubfx: fix build, tidy up, add JACK support 2014-01-19 13:01:49 +01:00
Cillian de Róiste
78c4b0868e zynaddsubfx: update from 2.4.1 to 2.4.3 2014-01-19 12:47:17 +01:00
Cillian de Róiste
cbacf96b1c yoshimi: add cairo as build input 2014-01-19 12:44:28 +01:00
Cillian de Róiste
e9e8cf4b98 Tidy up 2014-01-19 12:44:27 +01:00
Cillian de Róiste
ea72595fab yoshimi: update from 0.060.12 to 1.1.0 2014-01-19 12:43:58 +01:00
Cillian de Róiste
52213afd48 qsynth: add linux as a platform 2014-01-19 12:26:35 +01:00
Cillian de Róiste
51a5f9c364 hydrogen: update from 0.9.5 to 0.9.5.1
http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fxvg8py63xnwyyqmaws7n310l423xbp9h-hydrogen-0.9.5.1
2014-01-18 21:28:19 +01:00
Cillian de Róiste
329377b6ca synthv1: update from 0.3.2 to 0.3.6
http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fr5rfpb9zn3pa8yhxfz5d5ngqqj6n6mgg-synthv1-0.3.6
2014-01-18 21:27:41 +01:00
Cillian de Róiste
6105b41eac samplv1: update from 0.3.5 to 0.3.6
http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fdgrhrqf4j0q0601fgh81bhzkcgj7h4b0-samplv1-0.3.6
2014-01-18 21:27:06 +01:00
Cillian de Róiste
122905154c qtractor: update from 0.5.4 to 0.5.12
http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fyaq7iknwr79xwrmc4igrs3ygdy61ryjl-qtractor-0.5.12
2014-01-18 21:22:20 +01:00
Cillian de Róiste
c5269290c3 qsynth: update from 0.3.6 to 0.3.8
http://monitor.nixos.org/buildlog?outpath=%2Fnix%2Fstore%2Fycg9bkl40sch06kcyjvmnmkxq5mas9p6-qsynth-0.3.8
2014-01-18 21:16:28 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Moritz Ulrich
47f5d8a5ea streamripper: Fix wrong attribute path. 2014-01-17 01:15:10 +01:00
Moritz Ulrich
0ec365cd63 New package: Streamripper: Record MP3 radio streams. 2014-01-17 01:13:57 +01:00
Cillian de Róiste
bb1f0bdf40 drumkv1: update from 0.3.5 to 0.3.6
http://monitor.nixos.org/patch?p=drumkv1&v=0.3.6
2014-01-14 21:06:39 +01:00
Bjørn Forsman
32c087ab15 qjackctl: add meta.platforms 2014-01-14 17:17:56 +01:00
Nixpkgs Monitor
aec7a10d13 audacious: update from 3.4.1 to 3.4.3 2014-01-13 17:05:44 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Song Wenwu
6b7105d456 snd: update to 14.3 2014-01-11 19:40:24 +01:00
Song Wenwu
531090d5de add projectM 2.1.0 2014-01-11 19:14:28 +01:00
Arseniy Seroka
5787fc071a add lastfmsubmitd 2014-01-11 14:52:13 +01:00
Arseniy Seroka
678d7aada0 moc: fix mp3 playback and remove useless lib 2014-01-11 14:52:13 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Domen Kožar
3ef95f0582 Merge pull request #1453 from ttuegel/clementine
Add clementine-1.2.1 and dependencies
2014-01-02 14:21:18 -08:00
Thomas Tuegel
776dea8d24 add clementine-1.2.1 2014-01-02 14:49:22 -06:00
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát
50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik
1b9884b7ae opusfile: new package 2013-12-23 10:21:19 +01:00