Commit Graph
166990 Commits
Author SHA1 Message Date
Michael Raskin 640a13c04c Update Psi 2012-10-17 22:59:41 +04:00
Michael Raskin 3b01ff4591 Update Wireshark 2012-10-17 22:45:54 +04:00
Michael Raskin cdb8f0dfe4 Update Lazarus 2012-10-17 22:24:39 +04:00
Eelco Dolstra 53f008b854 Merge remote-tracking branch 'origin/x-updates' 2012-10-17 12:10:09 -04:00
Eelco Dolstra f7436a9141 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-17 12:07:03 -04:00
aszlig f9831a94c9 apache-httpd: Simplify all versionOlder calls.
We now just have a simple attribute called "version24" which replaces all those
pesky versionOlder that were spreading throughout the file and makes things way
more readable.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 17:47:30 +02:00
aszlig 919e6e55a9 apache-httpd: Create runtime dir for version 2.4.
By default the path is determined related to ServerRoot. Unfortunately
ServerRoot is pointing to the Nix store and the web server can't write to it.

We now create a directory called "runtime" withen the stateDir and point
DefaultRuntimeDir to it.

For more information on the DefaultRuntimeDir directive, please see:

http://httpd.apache.org/docs/2.4/mod/core.html#defaultruntimedir

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 17:38:43 +02:00
aszlig 5655ec0efa apache-httpd: Avoid NameVirtualHost in >= v2.4.
NameVirtualHost no longer has any effect on version 2.4 and just emits ugly
warnings, so let's not use it if we use 2.4.

More information: http://httpd.apache.org/docs/2.4/upgrading.html#misc

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 17:03:50 +02:00
aszlig a88453fbaa apache-httpd: Properly wrap access directives.
The Order/Deny directives are deprecated in version 2.4, so we're going to
define two wrappers for allDenied and allGranted in order to properly generate
configurations for both version 2.2 and 2.4.

For more information an access control changes, see:

http://httpd.apache.org/docs/2.4/upgrading.html#access

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 16:57:18 +02:00
aszlig 0b592ce677 apache-httpd/2.4: Add modules for NixOS service.
The NixOS service module loads those modules by default. So we need to build
them here as well.

I'm not really sure why these modules are included by default, because (except
from maybe CGI) they obviously are only usable in very rare cases. Am I wrong?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:56:08 +02:00
aszlig 2f3dcb9dd2 apache-httpd/2.4: Fix libxml2 support.
The reason because the configure script is unnable to find libxml2 is because it
is searching for a header file in `libxml/*.h`. Obviously this cases an error,
because it's actually in `${libxml2}/include/libxml2/libxml/*.h`, so let's add
the parent directory to --with-libxml2 and remove the comment from buildInputs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:56:07 +02:00
aszlig 3acd98b040 apache-httpd: Add unixd for 2.4, needed by "User".
Beginning with 2.4 mod_unixd is needed to supply Unix usernames and groups for
the web server. For details please have a look at:

http://httpd.apache.org/docs/2.4/upgrading.html#commonproblems

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:34:08 +02:00
Michael Raskin 07f44ad945 Update Wine 2012-10-17 17:22:32 +04:00
aszlig 3ad8fac5a2 apache-httpd: Dynamically load MPM module in v2.4.
Now, MPMs can be loaded at runtime and it's no longer required to compile in one
of the MPM modules statically. So, if version is >= 2.4, load the MPM module
corresponding to the multiProcessingModule value of the service module.

For details, please see: http://httpd.apache.org/docs/2.4/mpm.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:17:48 +02:00
aszlig 18076e001a apache-httpd: Use authn_core for version >= 2.3.
Beginning with version 2.3, the authn were refactored. As a result, authn_alias
is now part of the new module authn_core, so let's use authn_core instead of
authn_alias.

For details please see: http://httpd.apache.org/docs/2.4/upgrading.html#misc

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:11:53 +02:00
Michael Raskin cdd51e2730 Update Squid 3.2 to the latest 3.2.2 version 2012-10-17 16:44:26 +04:00
Michael Raskin 8eec7bf2f6 Updating BIND to freshest version 9.9.2 2012-10-17 16:27:38 +04:00
Eduard Carreras 9acffb949d Change copy file to symbolic link 2012-10-17 14:16:23 +02:00
Eduard Carreras febe086bba Changing copy files to symbolic links to them 2012-10-17 14:11:08 +02:00
Michael Raskin df2975f928 Update ECL to 12.7.1 2012-10-17 15:22:43 +04:00
Michael Raskin 3f0c47091c Update Clozure Common Lisp to version 1.8 2012-10-17 11:09:44 +04:00
Baptist BENOIST 28c909af86 vtk: latest version + useQt4 option
- Updated vtk to v5.10.0 (latest tagged release)
- Introduced a useQt4 option which allows to set the VTK_USE_QT option to true
- Added a package named vtkWithQt4 in the all-packages list

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 23:19:59 +02:00
Eelco Dolstra ae7044a001 nix: Update to 1.2pre2950_ac238d6 2012-10-16 17:11:54 -04:00
Eelco Dolstra c0ae221bb0 patch: Update to 2.7.1
Also disable the tests on FreeBSD.

http://hydra.nixos.org/build/3070072
2012-10-16 15:05:39 -04:00
Eelco Dolstra 0008138201 checkPhase: Pass VERBOSE=y so that failing tests show something useful 2012-10-16 15:00:51 -04:00
Eelco Dolstra e4a11b4d92 gcc: Get rid of lib64 2012-10-16 14:34:27 -04:00
Eelco Dolstra 877838870e w3m: Fix build
http://hydra.nixos.org/build/3081853
2012-10-16 14:33:08 -04:00
Eelco Dolstra ca298b5fe6 net-tools: Update to 1.60_p20120127084908
Apparently token ring support is gone in the kernel.

http://hydra.nixos.org/build/3081969
2012-10-16 14:29:31 -04:00
Eelco Dolstra 6c75d07e65 automake: Update to 1.12.4
Also disable tests, they're really way too slow.

http://hydra.nixos.org/build/3082076
2012-10-16 14:09:57 -04:00
Eelco Dolstra 49c8c2bc72 Update stdenv.is64bit 2012-10-16 13:53:43 -04:00
Eduard Carreras 28181c15e8 Make virtualbox icons available 2012-10-16 19:35:59 +02:00
Peter Simons 9b302e1518 Merge branch 'master' into x-updates 2012-10-16 19:10:46 +02:00
Peter Simons 347b5800b2 grub-2.0: strip trailing whitespace 2012-10-16 19:10:16 +02:00
Peter Simons 06bdd77d3d grub-2.0: fix bash completion script 2012-10-16 19:10:11 +02:00
Peter Simons 56f90da276 modules/programs/bash: '/run/current-system/sw' is already a part of $NIX_PROFILES 2012-10-16 19:08:10 +02:00
Peter Simons 6a9b855412 modules/programs/bash: '/run/current-system/sw' is already a part of $NIX_PROFILES 2012-10-16 19:07:19 +02:00
Peter Simons 04a8642b4b modules/programs/bash: clean-up variables used in initialization of bash-completion 2012-10-16 18:41:45 +02:00
Peter Simons efc104c4c8 modules/programs/bash: improve bash completion support
The new configuration.nix option 'environment.enableBashCompletion'
determines whether bash completion is automatically enabled system-wide
for all interactive shells or not. The default setting is 'off'.
2012-10-16 18:41:45 +02:00
Peter Simons c7fb0defe6 modules/programs/bash: clean-up variables used in initialization of bash-completion 2012-10-16 18:41:20 +02:00
Eduard Carreras d22e3a02fd Put eclipse icon into share/pixmaps 2012-10-16 18:38:53 +02:00
Peter Simons 82e94ccbeb Merge branch 'master' into x-updates 2012-10-16 18:27:27 +02:00
Peter Simons 31b7510e22 bash-completion: remove NixOS-specific patch
The new bash-completion support in NixOS doesn't require this patch anymore.
Besides, the patch was insufficient for most purposes anyway: Bash completion
modules are spread out over all user profiles listed in $NIX_PROFILES (plus the
current-system profile), so getting full support for all installed modules
requires support for more than one "bash_completion.d" directory anyway.
2012-10-16 18:26:02 +02:00
Peter Simons 4ca0617f4a modules/programs/bash: improve bash completion support
The new configuration.nix option 'environment.enableBashCompletion'
determines whether bash completion is automatically enabled system-wide
for all interactive shells or not. The default setting is 'off'.
2012-10-16 18:23:28 +02:00
Baptist BENOIST ca264f8da0 Add gmrun-0.9.2
Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:13 +02:00
Baptist BENOIST 440656dbd0 Add qtcreator-2.5.2
Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:13 +02:00
Baptist BENOIST 829ad425d3 Add xfe-1.33 and fox-1.6.9
This specific version of fox is required by xfe

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Baptist BENOIST 946dcba80b Add fox-1.7.9
Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Baptist BENOIST 51fe788417 Add geany-1.22
Geany is a small and lightweight Integrated Development Environment.
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
Geany only requires the GTK2 runtime libraries.

Some basic features of Geany:
 - Syntax highlighting
 - Code folding
 - Symbol name auto-completion
 - Construct completion/snippets
 - Auto-closing of XML and HTML tags
 - Call tips
 - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
 - Symbol lists
 - Code navigation
 - Build system to compile and execute your code
 - Simple project management
 - Plugin interface

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Baptist BENOIST e45d4e2722 Add bbenoist as maintainer
Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:11 +02:00
Eelco Dolstra dbfcc9336c cairo: Update to 1.12.4 2012-10-16 12:00:41 -04:00