Commit Graph

46088 Commits

Author SHA1 Message Date
Eelco Dolstra
ac8775dd96 $xcodePath -> $SDKROOT
SDKROOT is standard. In particular, this fixes the cmake build on
Mac OS X 10.9.
2014-07-24 21:53:46 +02:00
Eelco Dolstra
bf0d518c67 stdenv-darwin: Shut up some warnings from SDK headers
The Carbon headers spew out zillions of multichar / deprecations warnings,
which isn't very helpful. So turn them off.
2014-07-23 11:47:46 +02:00
Eelco Dolstra
eb6c0826c5 libsamplerate: Use default gcc 2014-07-23 11:45:44 +02:00
Eelco Dolstra
b52da47cf1 audiofile: Use default gcc 2014-07-23 11:28:26 +02:00
Eelco Dolstra
4c2c0499f3 enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
Eelco Dolstra
922af7f158 libsndfile: Fix build on Darwin
Fixes #3347.
2014-07-23 11:00:41 +02:00
Eelco Dolstra
a1a3811506 flac: Disable tests
These take a stupid amount of time.
2014-07-23 10:48:27 +02:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
adc2edd5cf thunderbird: major update 17.* -> 31.0
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra
2014-07-22 22:18:24 +02:00
Vladimír Čunát
27fe53e89c nss: minor update
I couldn't find any kind of news or changelog.
2014-07-22 22:12:19 +02:00
Vladimír Čunát
5fa61a2904 blender: use permanent URL for the patch
No hash changes.
2014-07-22 18:06:42 +02:00
Vladimír Čunát
644c9eb6f7 Revert "Merge #3054: add kde 4.13.2"
This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e, reversing
changes made to 07a09fbe63.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
2014-07-22 17:48:14 +02:00
Eelco Dolstra
402688b752 gcc: Fix multilib builds
http://hydra.nixos.org/build/12578050
2014-07-22 13:36:00 +02:00
Eelco Dolstra
0b996d886b opencv: Enable fewer dependencies by default
In particular, this prevents KDE from pulling in gfortran, numpy and
atlas. We don't want anything important depending on atlas because it
has a crazy non-deterministic build system.

http://hydra.nixos.org/build/12555947
2014-07-22 13:36:00 +02:00
Eelco Dolstra
b9e9e90a02 readline-6.3: Fix build on Mac OS X < 10.9
http://hydra.nixos.org/build/12476331
2014-07-22 11:24:00 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Eelco Dolstra
f77abc8b7a go: Fix build
http://hydra.nixos.org/build/12538479
2014-07-22 10:49:46 +02:00
Pascal Wittmann
7491fccfe6 Merge pull request #3338 from svenkeidel/gpodder-metainfo
added metainformation for gpodder and mygpoclient
2014-07-22 10:20:27 +02:00
Sven Keidel
4ef371e1f6 added platform meta information to gpodder 2014-07-22 09:39:06 +02:00
lethalman
27a5a68e41 Merge pull request #3336 from DamienCassou/installing-on-efi
Adding a missing instruction for EFI installations
2014-07-22 09:36:26 +02:00
Sven Keidel
ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
Pascal Wittmann
261ecebfaf Merge pull request #3323 from wjlroe/logstash-1.4.2
Logstash 1.4.2
2014-07-21 20:02:11 +02:00
Pascal Wittmann
5156b5d11d Merge pull request #3260 from linquize/gbdfed
gbdfed: add package 1.6
2014-07-21 19:49:26 +02:00
Bjørn Forsman
f8778ed82c openopc: new package
"OPC (OLE for Process Control) toolkit designed for use with Python"

This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.

It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.

Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).

http://openopc.sourceforge.net/
2014-07-21 18:43:33 +02:00
lethalman
5cde295b1d Merge pull request #3327 from svenkeidel/gpodder
added gpodder package
2014-07-21 18:37:28 +02:00
Sven Keidel
75b3c9eb95 Use make install instead of setup.py directly.
Using setup.py results in the following error message:

    Missing file: share/applications/gpodder.desktop

    If you want to install, use "make install" instead of using
    setup.py directly. See the README file for more information.
2014-07-21 18:05:08 +02:00
Sven Keidel
1a484c8ba2 moved wrapper declaration to preFixup 2014-07-21 17:58:27 +02:00
Damien Cassou
812da7cd2f Adding a missing instruction for EFI installations
This commit also adds a link to rEFInd which is a useful tool to manage
EFI systems. If this link is not desired, I can remove it.
2014-07-21 17:54:38 +02:00
William Roe
8f31b13938 Fix service to use logstash new directory layout 2014-07-21 16:24:18 +01:00
Shea Levy
430bf4719e Add plugins haskell package 2014-07-21 09:44:39 -04:00
Oliver Charles
a80a701101 haskellPackages.engineIO/engineIOSnap/socketIO: Update to latest versions 2014-07-21 14:24:57 +01:00
Vladimír Čunát
4cbf520bfe e18.enlightenment: fix build by adding bzip2
I'm lazy to find how exatly the need propagated in x-updates.
2014-07-21 15:06:44 +02:00
Oliver Charles
977add9710 haskellPackages.engineIO: Update to 1.0.2 2014-07-21 13:58:41 +01:00
Vladimír Čunát
9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát
65ac375aa2 Revert "qt4: try enableParallelBuilding again"
This reverts commit e8dc6258a1.

It's unfortunate, but there still are occurrences of the missing ui_qtgradientview.h
on Hydra: http://hydra.nixos.org/build/12625390/nixlog/1/tail-reload
2014-07-21 10:09:38 +02:00
Vladimír Čunát
923bf0a3ff mpv: major update, incl. build fix with new ffmpeg
CC @AndersonTorres. The real build fix is in previous minor updates,
but I see no reason not to have the major updates as well.
2014-07-21 10:05:50 +02:00
Vladimír Čunát
34cade2c9c mplayer2: switch to libav to fix build
CC @viric. If someone has a better suggestion, do it.
IMHO the main problem is the lack of maintenance
from the side of mplayer2, e.g. latest release >3 years ago.
2014-07-21 09:57:48 +02:00
Vladimír Čunát
f63fb3fda0 blender: fix parallel builds 2014-07-21 09:57:16 +02:00
Bjørn Forsman
cd3ba19ec0 asciidoc: add enableExtraPlugins expression argument
'enableExtraPlugins = true' enables all the extra plugins (filters and
backends) that are available in the expression. This simplifies the
configuration for users who want to have the fullest possible asciidoc
configuration (not needing to enable each individual plugin).
2014-07-20 23:03:27 +02:00
Bjørn Forsman
0ab24ad8c8 Revert "asciidoc: properly differentiate the "-full" variant in meta.description"
I changed my mind about this, I no longer think that meta.description
should differ depending on the package configuration. A package
configuration can be very fine grained, and I don't think it's
possible/preferable to describe this in meta.description.

This reverts commit 9033821c34.
2014-07-20 23:03:27 +02:00
Cillian de Róiste
bc8fe732d0 Add gimpPlugins.focusblur 2014-07-20 21:28:50 +02:00
Sven Keidel
eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Peter Simons
5c0659f2b4 Merge pull request #3324 from linquize/git-2.0.2
git: Update to 2.0.2
2014-07-20 21:12:19 +02:00
Peter Simons
6609493aa5 Merge pull request #3322 from bennofs/haskell-gtk-gio
haskell-gtk: re-generate after applying NixOS/cabal2nix#70
2014-07-20 21:11:49 +02:00
Linquize
4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
William Roe
b6c2dc4e4f License, platforms and maintainer for Logstash 2014-07-20 16:09:19 +01:00
Benno Fünfstück
e2046181b6 haskell-gtk: re-generate after applying NixOS/cabal2nix#70 2014-07-20 16:56:19 +02:00
Pascal Wittmann
52cf78ef22 added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
Pascal Wittmann
c7add6c270 Merge pull request #3317 from Mathnerd314/prelink
Add prelink package
2014-07-20 14:03:12 +02:00