Mateusz Kowalczyk
c7bbc288b5
Merge branch 'cmplayer' of https://github.com/abbradar/nixpkgs
...
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 23:00:41 +01:00
Daniel Peebles
72e76a18c1
Update maven to 3.2.3 and put it in a more sensible location
...
Closes #4187 .
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 22:33:18 +01:00
Daniel Peebles
588a5e92a3
Add commons-math (binary until I get maven build working)
...
Drop jakarta name from fileupload and update its version
Jakarta regexp has been officially retired, and nothing in nixpkgs uses it, so let’s get rid of it.
Add commons-io
More commons additions/cleanup
Closes #4181
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 22:31:47 +01:00
Thomas Tuegel
26ebd25844
Merge branch 'maintainer-updates'
2014-09-20 15:55:25 -05:00
roconnor
bbd58db13a
Merge pull request #4133 from vbgl/coq-8-3
...
Fixes coq-8.3: requires OCaml 3.12 and lablgtk 2.14
2014-09-20 16:24:10 -04:00
Thomas Tuegel
cfcf643bb9
Version bump: libfm-1.2.2.1 and menu-cache-0.7.0
2014-09-20 13:20:19 -05:00
Vincent Laporte
40e79043b0
mkOcamlPackages: simpler rule for lablgtk
2014-09-20 18:53:43 +01:00
Peter Simons
e95208ea86
haskell-ghc-mod: update default to version 5.x
2014-09-20 18:00:04 +02:00
Nikolay Amiantov
6dfb6e5426
deadbeef: add package
2014-09-20 13:38:52 +02:00
Bjørn Forsman
8983b60f87
wireshark: add CLI and Qt versions
...
In addition to our existing GTK version.
* Only install desktop file if building a GUI version.
* The Qt build appends "-qt" to the
wireshark binary name. Undo it so the desktop file works.
* The 'wireshark' attribute still refers to the GTK version, for
backwards compatibility.
2014-09-20 13:28:46 +02:00
Dmitry Malikov
7ad0646dc0
haskellPackages.cabalg: 0.2.9
2014-09-20 13:32:43 +04:00
Daniel Peebles
4cb2357782
Drop the jakarta name from BCEL and update its version.
...
Closes #4180 .
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 07:13:24 +01:00
roconnor
cbf79969b3
Merge pull request #4120 from NixOS/gnupg
...
Add pinentry optional dependency for gnupg.
Delete gnupg2_1.
2014-09-19 23:44:53 -04:00
Domen Kožar
cb4d686b1d
pypyPackages.sqlalchemy_imageattach: disable tests on pypy
2014-09-19 21:11:06 +02:00
Domen Kožar
9cad5e755f
Merge pull request #4170 from vbgl/ocaml-sexplib-camlp5
...
Updates ocaml-sexplib and ocaml-typeconv
2014-09-19 20:45:14 +02:00
Vincent Laporte
8febae5dfd
Updates ocaml-sexplib and ocaml-typeconv
...
Fixes OCaml / camlp5 version mismatch
2014-09-19 19:09:37 +01:00
William A. Kennington III
4cb5e39de6
Merge pull request #4157 from abbradar/icedtea-web
...
Add support for IcedTea in Firefox
2014-09-19 10:30:28 -07:00
(cdep)illabout
e52caabe63
Took out builder script for default builder.
...
Removed the builder script in order to use the default builder based on
comments from a code review.
2014-09-19 17:28:24 +02:00
(cdep)illabout
62e4bf2716
Adding roxterm package.
2014-09-19 16:13:05 +02:00
Georges Dubus
f72fdbd885
Merge pull request #4124 from k0ral/glances
...
Upgraded glances package to v2.1, and packaged its dependencies.
2014-09-19 14:42:26 +02:00
Peter Simons
ee4a606cdf
Merge pull request #4165 from ftrvxmtrx/pcalc
...
added pcalc package
2014-09-19 14:42:07 +02:00
Peter Simons
93884f2d23
Merge pull request #4163 from Twey/tasty-program
...
New Haskell package: tasty-program
2014-09-19 14:40:36 +02:00
Domen Kožar
96f4a47199
graphite_api: disable on pypy
2014-09-19 14:07:27 +02:00
Siarhei Zirukin
00298c7bba
added pcalc package
2014-09-19 13:31:52 +02:00
cillianderoiste
1b8d79e0b2
Merge pull request #4143 from geerds/cask
...
Add "cask" package
2014-09-19 13:23:28 +02:00
James ‘Twey’ Kay
e4e5b17b8d
Add tasty-program to haskell-packages
2014-09-19 12:18:37 +01:00
Nikolay Amiantov
f7ae09b5af
wrapFirefox: add support for firefox.icedtea
2014-09-19 06:15:06 +04:00
Nikolay Amiantov
e81589e2c1
cmplayer: add package
2014-09-19 03:52:11 +04:00
koral
2a56f3d3f3
Added termite package and updated vte to be compatible.
2014-09-18 23:29:58 +02:00
koral
867575b78e
Upgraded glances package to v2.1, and packaged its dependencies.
...
Disabled glances for pypy.
2014-09-18 23:13:17 +02:00
Bjørn Forsman
f6148e10a3
grails: new package
...
Grails is an Open Source, full stack, web application framework for the
JVM. It takes advantage of the Groovy programming language and
convention over configuration to provide a productive and stream-lined
development experience.
http://grails.org/
2014-09-18 22:57:03 +02:00
Peter Simons
aa67e95bb5
haskell-here: revert "new expression"
...
This reverts commit 3e5bcdc327
. The
package doesn't compile.
2014-09-18 21:16:44 +02:00
Russell O'Connor
2b4e35bfd3
Remove unmaintained gnupg2_1.
2014-09-18 14:46:54 -04:00
Joachim Schiele
5b17ce8675
Merge pull request #4149 from qknight/dog
...
dog-1.7: added potential cat replacement
2014-09-18 18:08:55 +02:00
Joachim Schiele
03b411d968
Merge pull request #4150 from qknight/dfc
...
dfc-3.0.4: a colored df -h replacement
2014-09-18 18:08:38 +02:00
Joachim Schiele
2a3bae70b4
Merge pull request #4063 from qknight/dcfldd
...
dcfldd: added advanced dd replacement
2014-09-18 18:08:07 +02:00
Joachim Schiele
dc86f52740
dfc-3.0.4: a colored df -h replacement
2014-09-18 18:06:49 +02:00
lethalman
1fe2905b26
Merge pull request #4146 from DamienCassou/screenkey
...
Add screenkey to screencast your keys
2014-09-18 17:51:12 +02:00
Damien Cassou
092235bde6
Add screenkey to screencast your keys
2014-09-18 17:42:04 +02:00
Joachim Schiele
c60bd6e435
dog-1.7: added potential cat replacement
2014-09-18 17:41:36 +02:00
Luca Bruno
eca58fd02f
vimNox: fix after lua upgrade for ZHF
2014-09-18 16:22:37 +02:00
lethalman
72c2898e74
Merge pull request #4142 from wyvie/lua51filesystem
...
Added lua-filesystem module built with lua-5.1
2014-09-18 15:58:01 +02:00
wyvie
e8c2159809
Added lua-filesystem module built with lua-5.1
2014-09-18 17:17:06 +04:00
Domen Kožar
47761617d0
python33Packages.sqlalchemy_imageattach: disable
2014-09-18 14:21:55 +02:00
Luca Bruno
979206c0b1
mysqlWorkbench: fix after lua upgrade for ZHF
2014-09-18 12:37:50 +02:00
Luca Bruno
634e9ab4f8
love: fix after lua upgrade for ZHF
2014-09-18 12:37:50 +02:00
Luca Bruno
0ce741f571
eiskaltdcpp: fix after lua upgrade for ZHF
2014-09-18 11:26:26 +02:00
Luca Bruno
bca4fa5fc0
asc: fix after lua upgrade for ZHF
2014-09-18 11:26:26 +02:00
Luca Bruno
6e6dc04a6b
awesome 3.4: fix after lua upgrade for ZHF
2014-09-18 11:00:26 +02:00
Pascal Wittmann
180b9939d7
Merge pull request #4130 from k0ral/httptunnel
...
Added httptunnel package.
2014-09-18 10:13:46 +02:00