Commit Graph

41786 Commits

Author SHA1 Message Date
Eelco Dolstra
4ae3e32e82 Merge pull request #4012 from ibeex/master
added darwin as supported platform for meld
2014-09-09 15:35:58 +02:00
Ivan Brkanac
841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Pascal Wittmann
95b4d2af94 Merge pull request #3934 from MP2E/chocolate-doom
chocolateDoom and chocolateDoomMaster added
2014-09-09 12:16:18 +02:00
Domen Kožar
78e5e556cc Revert "fixes #1923"
This reverts commit 1849840aa3.

Breaks git-annex
2014-09-09 12:11:53 +02:00
Georges Dubus
c7da3fe7be nox: updated sha to work after the recent fetchgit changes 2014-09-09 12:01:17 +02:00
William A. Kennington III
04b2f73236 unetbootin: 603 -> 608 2014-09-08 23:46:44 -07:00
Cray Elliott
d2270f8d79 Fix chocolateDoom and chocolateDoomMaster descriptions 2014-09-08 22:11:40 -07:00
Domen Kožar
1849840aa3 fixes #1923 2014-09-08 21:19:14 +02:00
Vladimír Čunát
dd3192f5ee Revert "spaceFM: update from 0.9.2 to 0.9.4" (fixes #3916)
This reverts commit c53ae9b462.
It's just a temporary work-around until someone finds a real fix.
2014-09-08 18:28:14 +02:00
Pascal Wittmann
2d9956114d gtypist: update from 2.9.4 to 2.9.5 and fix typefortune
also adopted it and set platforms to linux
2014-09-08 17:37:16 +02:00
Bjørn Forsman
1a5501889c jenkins: update to latest (v1.579) 2014-09-08 17:08:05 +02:00
Bjørn Forsman
af2334912a jenkins: expression cleanup
* Include version number in package name
* Remove trailing dot in meta.description
* Simplify meta by using "with stdenv.lib;"
2014-09-08 17:05:15 +02:00
Eelco Dolstra
19b1fafe5f linux: Update to 3.12.28 2014-09-08 15:49:27 +02:00
Ricardo M. Correia
48105a0aa1 pythonPackages.beautifulsoup4: Fix hash
The src tarball was modified in the PyPI repository.

I have compared the old tarball against the new one, the only difference
being that the new one is missing the following files/directories:

AUTHORS.txt
COPYING.txt
doc/
NEWS.txt
scripts/
TODO.txt
2014-09-08 15:20:30 +02:00
Ricardo M. Correia
ae453d1a0e perlPackages.Plack: update from 1.0030 to 1.0031 2014-09-08 15:19:39 +02:00
Ricardo M. Correia
238a84ac78 grsecurity: Update stable and test patches
stable: 3.0-3.14.17-201408260041 -> 3.0-3.14.18-201409060013
test:   3.0-3.15.10-201408212335 -> 3.0-3.16.2-201409060014
2014-09-08 15:16:38 +02:00
Ricardo M. Correia
c155ae31ee Merge pull request #3992 from wkennington/master.kernel
Kernel Updates
2014-09-08 15:15:54 +02:00
Ricardo M. Correia
99d0c10a0b paxctl: Update from 0.8 -> 0.9 2014-09-08 15:14:48 +02:00
Ricardo M. Correia
d5df399a4b gradm: Update from 3.0-201405281853 -> 3.0-201408301734 2014-09-08 15:14:11 +02:00
Eelco Dolstra
af69fcde47 Fix Nixpkgs evaluation
error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
2014-09-08 13:10:13 +02:00
Oliver Charles
5e3eff3bbd haskellPackages.twitterConduit: Update to 0.0.5.8 and remove 'broken' flag 2014-09-08 12:08:03 +01: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
ff85b53c5f highlight: update to version 3.18 to fix build errors with Lua 5.2 2014-09-08 10:22:50 +02:00
Domen Kožar
0487521ab2 Merge pull request #4001 from aherrmann/pr_mpi
mpi4py: Disable for Python3 and PyPy
2014-09-07 19:56:34 +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
Andreas Herrmann
970f51ac0a mpi4py: Disable for Python3 and PyPy
Builds for Python3 and PyPy are failing at the moment [1-3]. Therefore, they
are disabled.

[1]: https://github.com/NixOS/nixpkgs/pull/3938#issuecomment-54750065
[2]: http://hydra.nixos.org/build/13993137/nixlog/1/raw
[3]: http://hydra.nixos.org/build/13873028/log/raw
2014-09-07 19:44:08 +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
f8c7e340a4 jquery-ui: update to latest stable (v1.11.1)
The current version (v1.10.4) is now called "legacy". The new stable version
has a different directory layout; it no longer splits css/ and js/ directories.
Since the *.js files refer to the *.css files by relative paths, I'm not
splitting them. Everything now goes to "$out/js/".

Also, upstream removed version numbers from filenames, so we don't need to
create those version-less symlinks anymore.
2014-09-07 13:36:13 +02:00
Bjørn Forsman
218c28934e jquery-ui: align attrname with pkgname (jquery_ui => jquery-ui) 2014-09-07 13:10:14 +02:00
Oliver Charles
9104888b38 haskellPackages.tastyAntXml: Update to 1.0.0.9 2014-09-07 11:40:47 +01: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
William A. Kennington III
fb9d919fe4 libotr: git -> 4.0.0 2014-09-06 18:47:24 -07:00
William A. Kennington III
844aef5bcf kernel: 3.16.1 -> 3.16.2 2014-09-06 18:10:13 -07:00
William A. Kennington III
ed7ce2bd81 kernel: 3.14.17 -> 3.14.18 2014-09-06 18:10:01 -07:00
William A. Kennington III
d3f80b36ba kernel: 3.10.53 -> 3.10.54 2014-09-06 18:09:48 -07:00
Cray Elliott
eb7dbf9067 Remove eternityMaster 2014-09-06 16:18:35 -07:00
Cray Elliott
b61d98728c Add notice for chocolateDoomMaster 2014-09-06 16:16:01 -07:00
Eelco Dolstra
4ead67b785 firefox: Workaround for building on i686-linux
http://hydra.nixos.org/build/13992569
2014-09-07 00:47:17 +02: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
Vladimír Čunát
ac03d296b9 telegram-cli: work around a build problem 2014-09-06 21:28:03 +02:00
Vladimír Čunát
420385f81a lua-5.2: minor update to fix CVE-2014-5461
Note that almost all packages use lua-5.1 which does remain vulnerable,
as they released no update on that branch. CC: @peti.
2014-09-06 21:26:03 +02:00
Nixpkgs Monitor
a71744392b pcre: update from 8.34 to 8.35 2014-09-06 20:10:37 +02:00
Aristid Breitkreuz
0d35711412 atd: use /var/setuid-wrappers/sendmail by default instead of ssmtp 2014-09-06 20:10:19 +02:00