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
152ae27aac
Merge remote-tracking branch 'origin/systemd-216' into staging
2014-09-08 13:53:33 +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
Luca Bruno
dfa6f03ea3
Do not assert absolute path for nodev grub device. Closes #3996
2014-09-08 12:00:34 +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
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
Nicolas B. Pierron
568f7d70b9
Merge pull request #3866 from nbp/remove-functionTo-type
...
Remove types.functionTo
2014-09-07 10:46:13 -07: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
Nicolas Pierron
4ff1ab5a56
Remove types.functionTo.
2014-09-07 19:41:45 +02:00
Nicolas Pierron
becde6132b
Replace environment.profileVariables by environment.profileRelativeEnvVars
2014-09-07 19:41:00 +02:00
Nicolas B. Pierron
388b7baa73
Merge pull request #3856 from nbp/submodule-declarations
...
Annotate option-set options with the file in which they are declared.
2014-09-07 10:39:47 -07:00
Nicolas B. Pierron
a4e60ebacf
Merge pull request #3811 from nbp/options-json
...
Export the list of options to XML & JSON, such that external tools can use it.
2014-09-07 10:39:03 -07:00
Nicolas Pierron
b5f0cc3cda
Merge options having the submodule type.
...
Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type. If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.
In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
2014-09-07 19:03:20 +02:00
Nicolas Pierron
bb944b4dc8
Annotate option-set options with the file in which they are declared.
...
This modification improves NixOS manual by listing in which file, each
submodule option is declared. This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
2014-09-07 19:03:20 +02:00
Nicolas Pierron
79411db08b
Export options.json & options.xml for building tools for NixOS.
2014-09-07 18:39:24 +02:00
Aristid Breitkreuz
476b94a34d
Merge pull request #3998 from bobvanderlinden/libfreefare
...
added libfreefare
2014-09-07 18:08:56 +02:00
Rickard Nilsson
da9ef1ddaa
Merge pull request #3999 from ip1981/master
...
Updated Mediawiki to 1.23.3
2014-09-07 18:02:05 +02:00
Igor Pashev
5c6e4e7433
Updated Mediawiki to 1.23.3
...
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
2014-09-07 17:50:51 +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
Domen Kožar
130e56cd42
nixos.tests.gnome3: wait 20sec for the screenshot
2014-09-07 14:51:10 +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
Nathaniel Baxter
5856fbc7d2
nixos-manual: Fix reference to obsolete configuration option
2014-09-07 11:58:06 +02:00
Aristid Breitkreuz
c3361f9414
perlPackages.FinanceQuote: update from 1.29 to 1.35
2014-09-07 11:34:15 +02:00
Pascal Wittmann
c210c0e422
Merge pull request #3993 from wkennington/master.bitlbee
...
Update Bitlbee and dependant libraries
2014-09-07 11:23:12 +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
Cray Elliott
eb7dbf9067
Remove eternityMaster
2014-09-06 16:18:35 -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
Rob Vermaas
f14d1d76bb
Azure: Fix authorized_keys
2014-09-06 22:54:15 +02:00
Domen Kožar
0418d8299d
disable a bunch of python packages on pypy
2014-09-06 22:25:00 +02:00
Rob Vermaas
e9c1fb0c89
Azure: Mount metadata 'CD' on /metadata
2014-09-06 21:53:10 +02:00
Rob Vermaas
81046b9e5d
Initial configuration + image generation script for Micro$oft Azure. Work in progress for #3986 .
2014-09-06 21:37:46 +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
Domen Kožar
18d9904433
nixos-option: fixes as suggested by @nbp
2014-09-06 20:59:14 +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
Nixpkgs Monitor
d54fd845bc
at: update from 3.1.14 to 3.1.15
2014-09-06 19:04:08 +02:00
Nixpkgs Monitor
73bd403a57
shared_mime_info: update from 1.2 to 1.3
2014-09-06 19:02:27 +02:00