Commit Graph
208820 Commits
Author SHA1 Message Date
Evgeny Egorochkin 35dc7d6f3c paramiko: fix chroot build: use pycrypto from Nixpkgs instead of getting it from the network.
mysql-workbench: minor cleanup.
Patch by Karn Kallio.

svn path=/nixpkgs/trunk/; revision=24482
2010-10-26 01:42:22 +00:00
Evgeny Egorochkin ee8d2ccc40 mysql-workbench: version bump
svn path=/nixpkgs/trunk/; revision=24481
2010-10-26 01:38:28 +00:00
Evgeny Egorochkin 93129530a9 Rake: Fix build. Patch by Ilya Cassina.
svn path=/nixpkgs/trunk/; revision=24480
2010-10-26 01:15:42 +00:00
Evgeny Egorochkin 3748bba126 ati-drivers: version bump and fix name/version. Patch by Cillian de Róiste.
svn path=/nixpkgs/trunk/; revision=24479
2010-10-26 00:35:38 +00:00
Evgeny Egorochkin 19e0cda8d8 Fix names of packages. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=24478
2010-10-26 00:22:44 +00:00
Eelco Dolstra dff372db3c * Fix evaluation of the luksroot module when luksRoot == null. The
problem is that configuration values below a mkIf are evaluated
  strictly even if the condition is false.  Thus "${luksRoot}" causes
  an evaluation error.  As a workaround, use the empty string instead
  of `null' as the default value.  However, we should really fix the
  laziness of mkIf.  It's likely that NixOS evaluation would be much
  faster if it didn't have to evaluate disabled configuration values.

svn path=/nixos/trunk/; revision=24477
2010-10-25 22:21:51 +00:00
Lluís Batlle i Rossell a95eb06e26 Updating the patch for ocaml on mips.
Reported by rixed@happyleptic.org

svn path=/nixpkgs/branches/stdenv-updates/; revision=24476
2010-10-25 21:13:05 +00:00
Lluís Batlle i Rossell f3da1c5e80 Adding a fix for an important glibc vulnerability, very easy to exploit:
http://www.securityfocus.com/bid/44347

svn path=/nixpkgs/branches/stdenv-updates/; revision=24475
2010-10-25 18:25:23 +00:00
Evgeny Egorochkin 421a80ae8f Make flash work in QtWebkit
svn path=/nixos/trunk/; revision=24474
2010-10-25 16:44:21 +00:00
Eelco Dolstra 5762edd607 * Linux 2.6.32: revert upstream patch
489fb490dbf8dab0249ad82b56688ae3842a79e8.  It causes the DomU clock
  to jump into the future and freeze after being saved and restored
  across a Dom0 reboot.  See 

    http://lists.xensource.com/archives/html/xen-devel/2010-10/msg00498.html
    http://lists.xensource.com/archives/html/xen-devel/2010-10/msg01174.html

svn path=/nixpkgs/trunk/; revision=24473
2010-10-25 16:36:42 +00:00
Eelco Dolstra f6f40521c3 * Disable the luksroot module for now because it gives an
evaluation error ("cannot coerce null to string").

svn path=/nixos/trunk/; revision=24472
2010-10-25 16:19:32 +00:00
Peter Simons b877ec26cb pkgs/os-specific/linux/psmisc: updated to version 22.13
svn path=/nixpkgs/trunk/; revision=24471
2010-10-25 14:38:45 +00:00
Peter Simons 7d7f7d8158 pkgs/os-specific/linux/psmisc: added an assert to ensure that no build is attempted on non-Linux platforms
svn path=/nixpkgs/trunk/; revision=24470
2010-10-25 14:38:41 +00:00
Peter Simons ef4a03f3da Moved tools/misc/psmisc to os-specific/linux/psmisc.
svn path=/nixpkgs/trunk/; revision=24469
2010-10-25 14:38:37 +00:00
Peter Simons 90490b0603 pkgs/servers/http/apache-httpd: updated to version 2.2.17
svn path=/nixpkgs/trunk/; revision=24468
2010-10-25 13:13:15 +00:00
Peter Simons 2bdf5c4fec pkgs/servers/http/apache-modules/mod_wsgi: added meta.platforms and meta.maintainer
svn path=/nixpkgs/trunk/; revision=24467
2010-10-25 13:13:09 +00:00
Peter Simons e75b4e4c91 pkgs/servers/http/apache-modules/mod_fastcgi: added meta.platforms and meta.maintainer
svn path=/nixpkgs/trunk/; revision=24466
2010-10-25 13:13:03 +00:00
Peter Simons 4fa49d4e8f pkgs/servers/http/apache-httpd: added meta.platforms and meta.maintainer
svn path=/nixpkgs/trunk/; revision=24465
2010-10-25 13:12:57 +00:00
Peter Simons 3527fd782a pkgs/servers/http/apache-httpd: dropped obsolete comment
svn path=/nixpkgs/trunk/; revision=24464
2010-10-25 13:12:33 +00:00
Michael Raskin 45f78e3feb Fixing source
svn path=/nixpkgs/trunk/; revision=24463
2010-10-25 09:04:45 +00:00
Michael Raskin ec500ae264 Add libfixposix
svn path=/nixpkgs/trunk/; revision=24462
2010-10-25 05:52:13 +00:00
Evgeny Egorochkin 84f61bc6d5 Strigi: bump to 0.7.2
svn path=/nixpkgs/trunk/; revision=24461
2010-10-25 05:20:44 +00:00
Evgeny Egorochkin 006f7291e4 Make Strigi indexing work in Nepomuk
svn path=/nixos/trunk/; revision=24460
2010-10-25 01:46:30 +00:00
Evgeny Egorochkin 791c758b41 Encrypted root support via LUKS
svn path=/nixos/trunk/; revision=24459
2010-10-25 00:57:30 +00:00
Lluís Batlle i Rossell d6f4a6d968 Updating eaglemode.
svn path=/nixpkgs/trunk/; revision=24456
2010-10-24 21:27:31 +00:00
Lluís Batlle i Rossell 0cb7f90cac Adding caneda
svn path=/nixpkgs/trunk/; revision=24450
2010-10-24 17:01:09 +00:00
Lluís Batlle i Rossell 227c632d18 Adding qucs
svn path=/nixpkgs/trunk/; revision=24449
2010-10-24 17:00:57 +00:00
Peter Simons c7756e473b pkgs/applications/version-management/git-and-tools: prefer fetchurl over fetchgit in topGit
svn path=/nixpkgs/trunk/; revision=24442
2010-10-23 22:39:53 +00:00
Michael Raskin 65ec046a15 Fix uzbl build
svn path=/nixpkgs/trunk/; revision=24440
2010-10-23 20:54:07 +00:00
Yury G. Kudryashov ac0dea26fb Fix typo
svn path=/nixpkgs/trunk/; revision=24439
2010-10-23 20:50:06 +00:00
Yury G. Kudryashov 6863d3f740 kdepim-4.4.7
svn path=/nixpkgs/trunk/; revision=24436
2010-10-23 18:48:49 +00:00
Yury G. Kudryashov 25869d5553 Fix kdepim-4.5 compilation
svn path=/nixpkgs/trunk/; revision=24435
2010-10-23 18:48:42 +00:00
Michael Raskin 90b626421d Make EQL buildable again
svn path=/nixpkgs/trunk/; revision=24434
2010-10-23 18:40:57 +00:00
Michael Raskin 0df1871b9d Update EQL
svn path=/nixpkgs/trunk/; revision=24432
2010-10-23 15:34:58 +00:00
Michael Raskin ba662a84e7 Update Monotone
svn path=/nixpkgs/trunk/; revision=24431
2010-10-23 15:28:18 +00:00
Lluís Batlle i Rossell 3592b9a796 Adding unarj
svn path=/nixpkgs/trunk/; revision=24430
2010-10-23 14:55:14 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Lluís Batlle i Rossell 327a2eae30 Changing the 'enableAdobeFlash' firefox/icecat wrapper option, so its negative
value does not mean "install gnash". I added an enableGnash check instead.

I've kept the default of Adobe Flash.

svn path=/nixpkgs/trunk/; revision=24428
2010-10-23 14:42:36 +00:00
Lluís Batlle i Rossell 3ae506c409 Updating libjpeg-turbo
svn path=/nixpkgs/trunk/; revision=24427
2010-10-23 14:42:31 +00:00
Evgeny Egorochkin 6951e2ad05 Konq-plugins: forgot the patch :(
svn path=/nixpkgs/trunk/; revision=24426
2010-10-22 19:47:23 +00:00
Russell O'Connor 9bcb9bcea1 Patching scons to give an absolute path to python rather than using ".../bin/env python"
When users install scons, users no longer need to also install python in their environment.


svn path=/nixpkgs/trunk/; revision=24425
2010-10-22 19:10:02 +00:00
Armijn Hemel 9992ba5e3f update to 2.7.4
svn path=/nixpkgs/trunk/; revision=24424
2010-10-22 16:06:32 +00:00
Peter Simons 1e7ef9e33f pkgs/development/libraries/libsamplerate: fixed the sha256 hash of the release tarball
svn path=/nixpkgs/trunk/; revision=24421
2010-10-22 15:04:26 +00:00
Evgeny Egorochkin fbbcd05f4d konq-plugins: fix compilation against qt 4.7
svn path=/nixpkgs/trunk/; revision=24419
2010-10-22 14:40:19 +00:00
Evgeny Egorochkin 88fb000fc1 Fix UID and GID clash between diferent packages
svn path=/nixos/trunk/; revision=24417
2010-10-22 13:18:26 +00:00
Evgeny Egorochkin 2118288557 KDE4: mp3 playback out of the box
svn path=/nixos/trunk/; revision=24416
2010-10-22 13:18:22 +00:00
Eelco Dolstra 2677562f8c * Remove Compiz Fusion (obsolete).
svn path=/nixpkgs/trunk/; revision=24414
2010-10-22 11:00:02 +00:00
Michael Raskin 8413c96cde Fix dependency
svn path=/nixpkgs/trunk/; revision=24412
2010-10-22 06:36:45 +00:00
Sander van der Burg 9c722e474d - Added nixos-build-vms command, which builds a virtual network from a network.nix expression (also used by nixos-deploy-network)
- Added a backdoor option to the interactive run-vms script. This allows me to intergrate the virtual network approach with Disnix
- Small documentation fixes

Some explanation:

The nixos-build-vms command line tool can be used to build a virtual network of a network.nix specification.
For example, a network configuration (network.nix) could look like this:

{
  test1 = 
    {pkgs, config, ...}:
 
    {
      services.openssh.enable = true;
      ...
    };

  test2 =
    {pkgs, config, ...}:
    
    {
      services.openssh.enable = true;
      services.xserver.enable = true;
    }

    ;
}

By typing the following instruction:

$ nixos-build-vms -n network.nix

a virtual network is built, which can be started by typing:

$ ./result/bin/run-vms

It is also possible to enable a backdoor. In this case *.socket files are stored in the current directory
which can be used by the end-user to invoke remote instruction on a VM in the network through a Unix
domain socket.

For example by building the network with the following instructions:

$ nixos-build-vms -n network.nix --use-backdoor

and launching the virtual network:

$ ./result/bin/run-vms

You can find two socket files in your current directory, namely: test1.socket and test2.socket.
These Unix domain sockets can be used to remotely administer the test1 and test2 machine
in the virtual network.

For example by running:

$ socat ./test1.socket stdio
ls /root

You can retrieve the contents of the /root directory of the virtual machine with identifier test1


svn path=/nixos/trunk/; revision=24410
2010-10-21 22:50:12 +00:00
Michael Raskin fb8e4c950f Adding fdm
svn path=/nixpkgs/trunk/; revision=24409
2010-10-21 22:03:36 +00:00