Commit graph

392 commits

Author SHA1 Message Date
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
Mathijs Kwik 64266a2197 opus-tools: upgrade to 0.1.8 2013-12-23 10:21:18 +01:00
Nixpkgs Monitor 7e3e830e81 qjackctl: update from 0.3.9 to 0.3.10 2013-12-23 05:21:36 +02:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Nixpkgs Monitor 458decf6c4 mhwaveedit: update from 1.4.21 to 1.4.23 2013-12-21 04:05:17 +02:00
Nixpkgs Monitor 64bdbc9271 samplv1: update from 0.3.2 to 0.3.5 2013-12-21 02:28:28 +02:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor 6b76ba365d jackmeter: update from 0.3 to 0.4 2013-12-18 18:18:32 +02:00
Nixpkgs Monitor 8e9ed874bf csound: update from 5.18.02 to 5.19.01 2013-12-18 18:18:23 +02:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor 19f3061d10 lingot: update from 0.9.0 to 0.9.1 2013-12-15 13:20:24 +02:00
Nixpkgs Monitor 9fa6637c90 bristol: update from 0.60.10 to 0.60.11 2013-12-15 11:25:57 +02:00
Nixpkgs Monitor c08c8ddb52 a2jmidid: update from 7 to 8 2013-12-15 11:25:55 +02:00
Arseniy Seroka 674047ed91 Add moc music player 2013-12-15 01:16:18 +04:00
Nixpkgs Monitor 34593a22b3 mpg123: update from 1.15.4 to 1.16.0 2013-12-14 17:59:57 +02:00
Vladimír Čunát 089da3ee5c Merge master into x-updates
Conflicts (simple):
	pkgs/top-level/all-packages.nix
2013-12-10 13:00:02 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Moritz Ulrich 5c59c84bcb audacity: update from 2.0.4 to 2.0.5 2013-12-09 00:24:16 +00:00
Jason \"Don\" O'Conal 0c5f72af58 spotify: fix finding libXdamage.so.1
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-08 23:48:10 +00:00
Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Evgeny Egorochkin 610532ac6a Revert "fluidsynth: switch to cmake build system" which causes mpd and calf to fail to detect
fluidsynth.

This reverts commit cd16faa257.
2013-12-05 07:45:04 +02:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Evgeny Egorochkin cd16faa257 fluidsynth: switch to cmake build system 2013-12-04 06:48:29 +02:00
Nixpkgs Monitor 3f5e010117 fluidsynth: update from 1.1.5 to 1.1.6 2013-12-04 06:46:32 +02:00
Nixpkgs Monitor 9a1643ff47 drumkv1: update from 0.3.2 to 0.3.5 2013-12-04 06:45:22 +02:00
Nixpkgs Monitor 465c863fb2 jalv: update from 1.4.0 to 1.4.2 2013-12-04 06:40:44 +02:00
Nixpkgs Monitor 5a131711fe caps: update from 0.9.7 to 0.9.16 2013-12-04 06:25:58 +02:00
Vladimír Čunát b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Bjørn Forsman 522275f297 qmmp: update 0.7.0 -> 0.7.3
The included changes seems to be only fixes, see
http://qmmp.ylsoftware.com/
2013-11-18 20:49:10 +01:00
Vladimír Čunát 747e757500 libunique: fix build, make the package unique
The one in gnome2 was failing to build,
but all there is likely in a desolate state anyway.

In gmpc it also seemed without any reason to have a duplicate.
2013-11-17 22:26:49 +01:00
Bjørn Forsman 452b25b6c3 qmmp: add meta.respositories
This metadata is used by the tool @phreedom is writing to automatically
find package updates.
2013-11-17 12:02:37 +01:00
Peter Simons dc9efcd02d milkytracker: fix evaluation 2013-11-07 12:59:45 +01:00
cillianderoiste ed67672aac Merge pull request #1181 from Zoomulator/master
New application: Milkytracker v0.90.85
2013-11-07 02:54:32 -08:00
Kim Simmons db2075b6d8 Added milkytracker: Compiles and runs. 2013-11-07 11:05:13 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Jonas Hoersch 795753bbc6 quodlibet: update to version 2.6.3
also provides two distinctive flavours, which either wrap the program to
pull in the gstreamer plugins or not.
2013-11-03 16:05:37 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Jason "Don" O'Conal 5a2011e0c3 googleMusicmanager: add expression
close #1056
2013-10-30 14:40:08 +02:00
Cillian de Róiste 9f6f87f76a MilkyTracker: Tidy up, sort buildInputs and use the attrPath for the license 2013-10-30 00:08:27 +01:00