Eelco Dolstra
88822dc23c
Merge branch 'p/orig-modular-stdenv' of github.com:vcunat/nixpkgs into staging
2014-09-08 22:32:11 +02:00
Luca Bruno
e4e39f26ba
Change default from gnome 3.10 to gnome 3.12
2014-09-08 18:35:45 +02:00
Vladimír Čunát
82797f98f2
Merge branch 'staging' into modular-stdenv
...
Conflicts:
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
585983bc95
Merge remote-tracking branch 'origin/staging'
...
Conflicts:
pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Peter Simons
073cd3cfb9
Update version of 'lua' and 'lua5' attributes to lua 5.2.
...
@vcunat kindly pointed out that earlier versions are vulnerable to
CVE-2014-5461. There remain a whole lot of packages that have hard-coded
use of version 5.1, unfortunately.
2014-09-07 19:55:30 +02:00
Aristid Breitkreuz
476b94a34d
Merge pull request #3998 from bobvanderlinden/libfreefare
...
added libfreefare
2014-09-07 18:08:56 +02:00
Bob van der Linden
c839205a69
added libfreefare
...
A library on top of libnfc for MIFARE support.
2014-09-07 16:23:23 +02:00
Pascal Wittmann
4537c1ab25
Merge pull request #3935 from MP2E/eternity-engine
...
Add eternity and eternityMaster, a Doom port by James Haley
2014-09-07 15:26:11 +02:00
Domen Kožar
dce3e9261b
pypy: disable some more packages
2014-09-07 14:51:11 +02:00
Bjørn Forsman
af26d5e25b
jquery: new package
...
jQuery is a JavaScript library designed to simplify the client-side
scripting of HTML.
I'm adding version 1.x instead of 2.x because 1.x supports IE 6, 7, 8
browsers and both versions are API compatible.
http://jquery.com/
2014-09-07 14:39:34 +02:00
Bjørn Forsman
218c28934e
jquery-ui: align attrname with pkgname (jquery_ui => jquery-ui)
2014-09-07 13:10:14 +02:00
Aristid Breitkreuz
c3361f9414
perlPackages.FinanceQuote: update from 1.29 to 1.35
2014-09-07 11:34:15 +02:00
William A. Kennington III
cc5d2cf55a
bitlbee: 3.2 -> 3.2.2
2014-09-06 18:47:47 -07:00
Cray Elliott
eb7dbf9067
Remove eternityMaster
2014-09-06 16:18:35 -07:00
Domen Kožar
301fe9360e
pypyPackages.skype4py: disable
2014-09-07 00:13:34 +02:00
Domen Kožar
7668e3dafe
sip: use package from pythonPackages attrset
2014-09-07 00:13:34 +02:00
Domen Kožar
0418d8299d
disable a bunch of python packages on pypy
2014-09-06 22:25:00 +02:00
Nixpkgs Monitor
db0076b659
python34Packages.httplib2: update from 0.8 to 0.9, potentially fixes CVE-2013-2037
2014-09-06 18:32:11 +02:00
Domen Kožar
46acec64c2
pythonPackages.sqlalchemy{,8}: disable on py34
2014-09-06 18:13:14 +02:00
Domen Kožar
17f1043eb0
buildPythonPackage: support .override {}
2014-09-06 18:13:14 +02:00
Nixpkgs Monitor
424669e7b0
ack: update from 2.12 to 2.14
2014-09-06 18:10:06 +02:00
Domen Kožar
8d85bfefcf
pypyPackages.pycurl: disable
2014-09-06 17:16:44 +02:00
Domen Kožar
e69dd3b9aa
pypyPackages.psycopg2: disable
2014-09-06 17:12:11 +02:00
Domen Kožar
a9d25eae98
pypyPackages.lxml: 3.0.2 -> 3.3.6 (fixes pypy build)
2014-09-06 17:10:29 +02:00
Domen Kožar
7cc77a12e4
pypyPackages.numpy: disable and upgrade
2014-09-06 16:54:14 +02:00
Vladimír Čunát
06fea81c6e
Merge recent master into staging
...
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Domen Kožar
ee27bd1d99
pypyPackages.pil: fix build
2014-09-06 16:35:58 +02:00
Aristid Breitkreuz
e8a38b7822
add more convenient adapter for making debug builds
2014-09-06 16:19:27 +02:00
Domen Kožar
2eed178fe7
pypyPackages.fabric: disable tests
2014-09-06 16:15:40 +02:00
Domen Kožar
2c7290c58f
pythonPackages.sure: use upstream package, next release should have tests
2014-09-06 16:08:01 +02:00
Domen Kožar
b08be36879
pythonPackages.zope_testrunner: enable tests
2014-09-06 15:56:48 +02:00
Domen Kožar
0fc621e666
pypyPackages.greenlet: disable
2014-09-06 15:21:44 +02:00
Aristid Breitkreuz
538195e088
disable guile by default and add attribute for gdb-with-guile
2014-09-06 13:40:16 +02:00
Peter Simons
1e92a86240
emacs-rainbow-delimiters: add version 1.3.8
2014-09-06 13:30:44 +02:00
Peter Simons
4c5d12d3f0
all-packages.nix: re-arrange Emacs packages into a semi-alphabetical order
2014-09-06 13:30:44 +02:00
Nathaniel Baxter
f7ce66985a
bittorrent: Remove reference to deleted package.
2014-09-06 20:32:01 +10:00
Florent Becker
2709d32274
Add a derivation for eliom (ocaml web framework)
2014-09-06 12:44:33 +04:00
Florent Becker
e8250dd94a
Add a derivation for the ocsigen server (ocaml webserver)
2014-09-06 12:44:33 +04:00
Florent Becker
da6859722d
Add tyxml (XML library for ocaml)
2014-09-06 12:44:33 +04:00
Florent Becker
3245b97000
Add a derivation for js_of_ocaml
2014-09-06 12:44:32 +04:00
Florent Becker
b5c621062d
add ocaml-ipaddr
2014-09-06 12:44:32 +04:00
Florent Becker
ffe02360dc
Add a derivation for deriving (ocaml instance derivation à la Haskell)
2014-09-06 12:44:32 +04:00
Florent Becker
6863dfeccc
Add a derivation for ocaml-optcomp
2014-09-06 12:44:32 +04:00
Florent Becker
2ca3c23ddc
Add a derivation for ocaml-calendar
2014-09-06 12:44:32 +04:00
Christoph Hrdinka
2d912e29d5
build-fhs-chrootenv: fix gcc_multi paths
2014-09-06 00:25:49 +02:00
Christoph Hrdinka
c5f51039f4
steam: fix steam on x86_64
2014-09-06 00:25:48 +02:00
Domen Kožar
b420eeba44
remove bittorrent package since it's obsolete
2014-09-05 22:49:31 +02:00
Peter Simons
7f5bc10186
emacs-ensime: add current git snapshot
2014-09-05 16:06:16 +02:00
Peter Simons
e8bff6f838
emacs-s: add version 1.9.0
2014-09-05 16:06:16 +02:00