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
cb639302df
Merge glibc-2.18 branch into stdenv-updates
...
It's to separate from other changes coming from master.
Conflicts:
pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Vladimír Čunát
a126ce011a
gnumeric: add schemas and icons, refactor
...
Also move goffice under gnome3,
as it's released in the same way.
2013-12-28 15:45:20 +01:00
Eelco Dolstra
9f75797d0b
Merge remote-tracking branch 'origin/glibc-2.18'
2013-12-26 14:49:19 +01:00
Shea Levy
73e78c24fb
Update node packages to npm2nix-5.4.2 to fix tarball
...
Thanks @vcunat for pointing it out
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-26 06:43:21 -05:00
William A. Kennington III
f5374c123c
Add targetcli-fb as well as necessary dependencies
2013-12-26 10:58:15 +01:00
Song Wenwu
0889c86b86
midori: update from 0.4.4 to 0.5.6 ( close #1411 )
2013-12-26 09:19:19 +01:00
Evgeny Egorochkin
46c1216fd0
kde411: expose it to nix-env with a lower priority.
2013-12-26 04:23:53 +02:00
Florian Friesdorf
46f627e8f7
git-repo-1.19
2013-12-26 00:45:21 +01:00
Edward Tjörnhammar
01c39bdefc
Adding IntelliJ IDEA13 Community and Ultimate
2013-12-26 00:12:19 +01:00
Vladimír Čunát
b80d1c5923
Merge x-updates
2013-12-25 23:56:41 +01:00
AndersonTorres
378f962c0e
Aegisub: New Package
...
Adding Aegisub: an advanced movie subtitle editor
2013-12-25 22:24:19 +01:00
Moritz Ulrich
e87515e519
Opam 1.1: Constrain supported ocaml versions.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:43:23 +01:00
Malcolm Matalka
545216ee02
Opam: Update to 1.1.0
...
Also keeps 1.0 for backwards compatibility.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:18:28 +01:00
Shea Levy
7129ba057b
Update nodePackages
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-24 19:00:26 -05:00
Moritz Ulrich
109070d78a
perlPackages.ExtUtilsTypemapsDefault: Update to 1.05 (fixes tests).
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-24 22:38:59 +01:00
Mathijs Kwik
3db725c467
mpv: ffmpeg defaults to latest now
2013-12-24 10:52:14 +01:00
Peter Simons
71ee40a045
all-packages.nix: fix Emacs syntax highlighting
2013-12-23 19:29:24 +01:00
Vladimír Čunát
50ac037864
Merge master into x-updates
2013-12-23 19:27:14 +01:00
Peter Simons
6518480c1b
Merge pull request #1401 from monocell/haskore
...
haskore: new package
2013-12-23 09:13:05 -08:00
Vladimír Čunát
7a93e63ae9
libmng: update 1.0.10 -> 2.0.2, drop autotools phase
2013-12-23 18:10:54 +01:00
Mathijs Kwik
939a0d3b4a
firefox: enable gstreamer for h.264 support in HTML5 video
2013-12-23 15:48:36 +01:00
Mathijs Kwik
82131d5013
clucene_core: switch to versioning scheme to make overriding easier
2013-12-23 15:48:35 +01:00
Mathijs Kwik
af7df9a37b
add node rethinkdb driver
2013-12-23 11:29:16 +01:00
Mathijs Kwik
3c265cefdb
add node-protobuf + binary dep
2013-12-23 11:29:16 +01:00
Mathijs Kwik
a067bd0ffc
node-packages: upgrade all
2013-12-23 11:29:15 +01:00
Mathijs Kwik
d94aa96648
bitcoin: use default db4 now db48 is default
2013-12-23 11:10:19 +01:00
Mathijs Kwik
992e69abf4
freicoin: use default db4 now db48 is default
2013-12-23 11:10:18 +01:00
Mathijs Kwik
0be65b20a3
db4: change default 4.5 -> 4.8
2013-12-23 11:10:18 +01:00
Mathijs Kwik
8adf5a4f0c
kde-4.1*: use default/latest ffmpeg
2013-12-23 11:03:15 +01:00
Mathijs Kwik
2f166b3a3c
vlc: use default/latest ffmpeg
2013-12-23 11:03:15 +01:00
Mathijs Kwik
f7500f9571
mplayer2: use default/latest ffmpeg
2013-12-23 11:03:14 +01:00
Mathijs Kwik
70f3d42729
freerdp: pin to ffmpeg 1
2013-12-23 11:03:14 +01:00
Mathijs Kwik
9bd9ac6e8d
audacity: pin to ffmpeg 0.10
2013-12-23 11:03:14 +01:00
Mathijs Kwik
c6b59a6281
mediatomb: use default/latest ffmpeg
2013-12-23 11:03:14 +01:00
Mathijs Kwik
4fdeca4c57
opencv: use default/latest ffmpeg
2013-12-23 11:03:13 +01:00
Mathijs Kwik
3a1d772861
mlt: use default/latest ffmpeg
2013-12-23 11:03:13 +01:00
Mathijs Kwik
575a8c5f22
mediastreamer: use default/latest ffmpeg
2013-12-23 11:03:13 +01:00
Mathijs Kwik
7177855e4d
renpy: use default/latest ffmpeg
2013-12-23 11:03:13 +01:00
Mathijs Kwik
d1b14af0e5
grass: pin to ffmpeg 0.10
2013-12-23 11:03:12 +01:00
Mathijs Kwik
31a14a4d0b
xinelib: pin to ffmpeg 1
2013-12-23 11:03:12 +01:00
Mathijs Kwik
8e9232e797
baresip: pin to ffmpeg 1
2013-12-23 11:03:12 +01:00
Mathijs Kwik
2c8835c9db
xbmc: pin to ffmpeg 1
2013-12-23 11:03:12 +01:00
Mathijs Kwik
caaa4d1122
openscenegraph: pin to ffmpeg 0.10
2013-12-23 11:03:11 +01:00
Mathijs Kwik
bda93fb1e8
minidlna: pin to ffmpeg 0.10
2013-12-23 11:03:11 +01:00
Mathijs Kwik
ef214655d6
cfdg: use default/latest ffmpeg
2013-12-23 11:03:11 +01:00
Mathijs Kwik
d735014548
acoustid_fingerprinter: pin to ffmpeg_1
2013-12-23 11:03:10 +01:00
Mathijs Kwik
70c2d2416b
gst-ffmpeg: stick to ffmpeg 0.10
2013-12-23 11:03:10 +01:00
Mathijs Kwik
5b4635d6fa
ffmpeg: change default 0.10 -> 2.0
...
This commit, and the "pinnings" that follow should not cause major issues.
I personally checked (build-only) each and every package that depends
on ffmpeg to find the maximum supported version.
I performed this on stdenv-updates+glibc2.18+x-updates but I don't expect
that to matter.
2013-12-23 11:03:10 +01:00
Mathijs Kwik
d2ccef5140
ffmpeg: order and cleanup versions
2013-12-23 11:03:09 +01:00