philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

1203 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 25b9c03571 Updating from trunk (specially for the enableFontDir option, as it was not up 
to date for nixpkgs)


svn path=/nixos/branches/stdenv-updates/; revision=24871
 2010-11-26 14:16:12 +00:00
Lluís Batlle i Rossell bef46f1553 Moving which to type -P, so 'which ls', 'which time', ... work. 
svn path=/nixos/trunk/; revision=24862
 2010-11-26 09:57:38 +00:00
Eelco Dolstra 636307c62b * Create /var/lib/nfs/v4recovery. 
svn path=/nixos/trunk/; revision=24858
 2010-11-25 16:51:07 +00:00
Sander van der Burg b064f5c80e The Disnix avahi server now also publishes the 'system' attribute and the properties defined in config.deployment 
svn path=/nixos/trunk/; revision=24849
 2010-11-24 23:00:52 +00:00
Sander van der Burg 31b8ac8120 Implemented 'deployment' option to capture custom attributes related to the system configuration 
svn path=/nixos/trunk/; revision=24848
 2010-11-24 23:00:21 +00:00
Evgeny Egorochkin 2224d78b33 network-interfaces: MAC address support take 2: now it seems to work 
svn path=/nixos/trunk/; revision=24847
 2010-11-24 22:58:53 +00:00
Evgeny Egorochkin 72422d4126 network-interfaces: support changing MAC addresses of interfaces 
svn path=/nixos/trunk/; revision=24846
 2010-11-24 22:58:48 +00:00
Evgeny Egorochkin 50d8698fd8 network-interfaces: cleanup 
svn path=/nixos/trunk/; revision=24845
 2010-11-24 22:58:42 +00:00
Yury G. Kudryashov f58efe3336 Add kdm user. Kdm doesn't work here without kdm user 
svn path=/nixos/trunk/; revision=24835
 2010-11-24 10:45:34 +00:00
Michael Raskin 1b41b6d16d Fix Monit startOn parameter 
svn path=/nixos/trunk/; revision=24832
 2010-11-24 06:13:37 +00:00
Eelco Dolstra c958902d44 * Added an option "nixpkgs.system" to specify the system type for 
which NixOS should be built.  This is useful in NixOS network
  specifications, because it allows machines in the network to have
  different types, e.g.,

    {
      machine1 =
        { config, pkgs, ... }:
        { nixpkgs.system = "i686-linux";
          ... other config ...
        };

      machine2 =
        { config, pkgs, ... }:
        { nixpkgs.system = "x86_64-linux";
          ... other config ...
        };
    }

  It can also be useful in distributed NixOS tests.

svn path=/nixos/trunk/; revision=24823
 2010-11-23 16:07:00 +00:00
Sander van der Burg fcf53be5bd The DisnixWebService is also published through Avahi 
svn path=/nixos/trunk/; revision=24792
 2010-11-21 16:04:26 +00:00
Sander van der Burg ad48c7c534 Initial implementation for the Disnix avahi publisher 
svn path=/nixos/trunk/; revision=24789
 2010-11-21 13:28:48 +00:00
Michael Raskin c77c3ab22c Remove ttmkfdir reference 
svn path=/nixos/trunk/; revision=24662
 2010-11-11 13:24:37 +00:00
Nicolas Pierron 30943d2dc0 Fix nixos-option, accept long arguments. 
svn path=/nixos/trunk/; revision=24631
 2010-11-09 18:42:59 +00:00
Lluís Batlle i Rossell f319ca67c5 Trying to improve the message hit by new users, if they use the 2.6.36 
kernelPackages and don't disable the ttyBackgrounds. Some users got confused by
the previous message.


svn path=/nixos/trunk/; revision=24612
 2010-11-06 18:13:48 +00:00
Rob Vermaas f34d7250b3 mysql-backup.nix: add option to use single transaction for dumps 
svn path=/nixos/trunk/; revision=24594
 2010-11-04 08:13:57 +00:00
Eelco Dolstra cf84a44272 * Use buildEnv with a postBuild hook rather than buildEnvScript. 
svn path=/nixos/trunk/; revision=24593
 2010-11-03 22:37:39 +00:00
Sander van der Burg 4858ab9da8 The DisnixWebService is now also part of the systemPackages so that a user can invoke the client tool from the command-line 
svn path=/nixos/trunk/; revision=24564
 2010-11-02 04:20:37 +00:00
Sander van der Burg e39b10a4d9 - The Disnix service needs Nix in its PATH for now 
- Implemented an extraGroups property for tomcat to grant a tomcat application access to the Disnix service


svn path=/nixos/trunk/; revision=24561
 2010-11-01 19:01:26 +00:00
Sander van der Burg 9359ebf975 Implemented an option to enable to DisnixWebService on Apache Tomcat 
svn path=/nixos/trunk/; revision=24560
 2010-11-01 17:33:54 +00:00
Lluís Batlle i Rossell ccc99b3fc0 Updating from trunk 
svn path=/nixos/branches/stdenv-updates/; revision=24555
 2010-10-31 19:36:37 +00:00
Lluís Batlle i Rossell 8c27201ce0 Fixing mkOverride and openssh things on system-tarballs 
svn path=/nixos/branches/stdenv-updates/; revision=24554
 2010-10-31 19:34:39 +00:00
Lluís Batlle i Rossell edb5870deb Fixing the xterm PS1 for changing the window title, so it is properly bracketed for bash not to count the control sequences as printable characters. 
svn path=/nixos/trunk/; revision=24545
 2010-10-30 20:40:33 +00:00
Lluís Batlle i Rossell c4dd77ae9c Make apache start when filesystems are ready. 
svn path=/nixos/trunk/; revision=24544
 2010-10-30 20:05:38 +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
Evgeny Egorochkin 421a80ae8f Make flash work in QtWebkit 
svn path=/nixos/trunk/; revision=24474
 2010-10-25 16:44:21 +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
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
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
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 f6bc3d61cf To prevent glibc bug exploitation, make setuid-wrappers unreadable to non-root users 
svn path=/nixos/trunk/; revision=24378
 2010-10-20 09:29:02 +00:00
Eelco Dolstra baaf7bd6e3 * Updated the Compiz module: add the plugins, put ccsm in the PATH, 
and don't use GConf anymore.

svn path=/nixos/trunk/; revision=24374
 2010-10-19 23:25:53 +00:00
Lluís Batlle i Rossell 1acbc4a82f Updating from trunk. Blind commit - no coflicts. 
svn path=/nixos/branches/stdenv-updates/; revision=24370
 2010-10-19 20:45:35 +00:00
Sander van der Burg 936e4e73d7 Modified the nixos-deploy-network script to use a 2PC-like approach illustrated in the Disnix HotSWUp paper for system configurations 
svn path=/nixos/trunk/; revision=24352
 2010-10-18 19:47:46 +00:00
Eelco Dolstra 341698c367 * OpenVPN: add it to the system path when enabled. 
svn path=/nixos/trunk/; revision=24343
 2010-10-18 10:40:08 +00:00
Eelco Dolstra 2bb4a618e2 * Added an option "services.openssh.extraConfig" that allows 
setting arbitrary options in sshd_config, e.g.,

    services.openssh.extraConfig = "PermitTunnel yes";

svn path=/nixos/trunk/; revision=24341
 2010-10-18 10:31:41 +00:00
Nicolas Pierron 40df597205 Enables the following renaming A -> C & B -> C and A -> B & B -> C. 
svn path=/nixos/trunk/; revision=24295
 2010-10-14 18:18:38 +00:00
Eelco Dolstra 1b55007d63 * Don't use environment.kdePackages; environment.systemPackages works 
just as well.

svn path=/nixos/trunk/; revision=24290
 2010-10-14 14:57:38 +00:00
Eelco Dolstra 5e11683abc * Remove the useless "to" function. This ain't COBOL. 
svn path=/nixos/trunk/; revision=24289
 2010-10-14 13:57:15 +00:00
Evgeny Egorochkin 6cd14e3784 Intel 2100 wifi firmware: packaged 
svn path=/nixos/trunk/; revision=24285
 2010-10-14 12:33:20 +00:00
Eelco Dolstra f9a62453b0 * Set KDEDIRS in kdm, otherwise it can't find the wallpaper. 
svn path=/nixos/trunk/; revision=24282
 2010-10-14 12:11:37 +00:00
Eelco Dolstra fa04ae9738 * It's "tun", not "tap". 
svn path=/nixos/trunk/; revision=24217
 2010-10-11 17:06:49 +00:00
Eelco Dolstra 968437c5d0 * Enable xfce4-mixer. 
svn path=/nixos/trunk/; revision=24208
 2010-10-10 22:35:18 +00:00
Lluís Batlle i Rossell 4894a15c70 I had did a merge from trunk when nixos trunk was broken. Remerging after the 
trunk fix.


svn path=/nixos/branches/stdenv-updates/; revision=24203
 2010-10-10 11:55:05 +00:00
Lluís Batlle i Rossell 098a593fb4 Removing a nixos module reference I commited by error. 
svn path=/nixos/trunk/; revision=24202
 2010-10-10 11:50:50 +00:00
Lluís Batlle i Rossell 51d0ccdf3c Updating from trunk (to catch cron changes) 
I had some merge problems with the system-tarball; I hope I've resolved them.


svn path=/nixos/branches/stdenv-updates/; revision=24201
 2010-10-10 11:46:57 +00:00
Lluís Batlle i Rossell 79ded36abf Making cron/fcron set their setuid wrappers. And made fcron use the nixos systemCrontabJobs by 
default.
It does not look very modular, and the manual may not look very good, but I think it
works better than before. And setting cron.enable = false and fcron.enable = true works fine.


svn path=/nixos/trunk/; revision=24199
 2010-10-10 11:35:15 +00:00
Lluís Batlle i Rossell dc11ce585f Making vixie cron have the usual enable/disable nixos service option. 
svn path=/nixos/trunk/; revision=24198
 2010-10-10 11:14:02 +00:00
Lluís Batlle i Rossell 70a2ad7898 Requiring nixpkgs 24196, I made nixos set the sendmail path to vixie cron, so 
now vixie cron can send mail properly, for example if a user enabled the
'postfix' service.


svn path=/nixos/trunk/; revision=24197
 2010-10-10 11:08:10 +00:00
Lluís Batlle i Rossell a069fcffc6 Making a nixos option about the system 'sendmail', which postfix sets, for example. 
svn path=/nixos/trunk/; revision=24193
 2010-10-10 10:43:28 +00:00
Eelco Dolstra f9d4df1e04 svn path=/nixos/trunk/; revision=24185 2010-10-08 12:57:21 +00:00
Ludovic Courtès 8d88e37b27 avahi-daemon: Remove outdated and confusing comment. 
svn path=/nixos/trunk/; revision=24152
 2010-10-07 20:10:49 +00:00
Ludovic Courtès dc18e5488a NSS-mDNS: Allow both IPv4 and IPv6 address resolution. 
svn path=/nixos/trunk/; revision=24150
 2010-10-07 20:10:40 +00:00
Sander van der Burg 122e125d6b Added the nixos-deploy-network tool. With this tool you can write a network of NixOS configurations, e.g.: 
{
  test1 = {pkgs, config, ...}:
    {
       # NixOS config of machine test1
       ...
    };

  test2 = {pkgs, config, ...}:
    {
       # NixOS config of machine test2
       ...
    };
}

And an infrastructure expression, e.g:

{
  test1 = {
    hostName = "test1.example.org";
    system = "i686-linux";
  };
  test2 = {
    hostName = "test2.example.org";
    system = "x86_64-linux";
  };
}

And by executing:

nixos-deploy-network -n network.nix -i infrastructure.nix

The system configurations in the network expression are built, transferred to the machines in the network and finally activated. 


svn path=/nixos/trunk/; revision=24146
 2010-10-07 14:30:52 +00:00
Rob Vermaas d556b86f75 hydra-mirror: enable binary patches 
svn path=/nixos/trunk/; revision=24133
 2010-10-07 12:46:26 +00:00
Eelco Dolstra 81dbac4af3 * Don't run ntpd in DomU. 
svn path=/nixos/trunk/; revision=24125
 2010-10-06 20:22:36 +00:00
Eelco Dolstra cda2e41c01 * Added a "xendomains" job to automatically start the domains defined 
in /etc/xen/auto at boot time, to save all running domains during
  shutdown, and to restore all saved domains at boot time.

svn path=/nixos/trunk/; revision=24121
 2010-10-06 16:07:16 +00:00
Eelco Dolstra 102a1e15ba * Use the "iburst" flag. This makes ntpd synchronise in a few seconds rather than 
a few minutes by sending an initial burst of messages to the time servers.

svn path=/nixos/trunk/; revision=24119
 2010-10-06 16:03:37 +00:00
Rob Vermaas f2f048db4d mercurial/apache: put PYTHONPATH in globalEnvVars 
svn path=/nixos/trunk/; revision=24115
 2010-10-06 12:38:37 +00:00
Rob Vermaas 8d60cad42a mercurial: initial version for hgweb apache module 
svn path=/nixos/trunk/; revision=24111
 2010-10-06 11:21:15 +00:00
Eelco Dolstra aeb89fc753 * Set /proc/sys/kernel/poweroff_cmd to Upstart's poweroff command 
(rather than /sbin/poweroff).  Xen's "xm shutdown" needs this to
  enable the host to cleanly shutdown the guest.

svn path=/nixos/trunk/; revision=24094
 2010-10-05 17:58:58 +00:00
Eelco Dolstra 8b5fba4942 * Added a module that provides common configuration for DomU 
machines.

svn path=/nixos/trunk/; revision=24084
 2010-10-05 15:44:40 +00:00
Eelco Dolstra 35562ea4a3 * Don't daemonize; otherwise Upstart will respawn it. 
svn path=/nixos/trunk/; revision=24081
 2010-10-05 15:17:09 +00:00
Eelco Dolstra c5b39e70ef * Rename the xen module to xen-dom0. 
svn path=/nixos/trunk/; revision=24078
 2010-10-05 14:23:12 +00:00
Eelco Dolstra c8fc492acf * Start atd when udev has finished completely. Hopefully this fixes 
the random atd failures at boot time, which seem to be caused by a
  race with the creation of /dev/null or something.

svn path=/nixos/trunk/; revision=24077
 2010-10-05 14:22:06 +00:00
Eelco Dolstra 17213c4f2a * When generating a GRUB 1 menu, don't use the "module" command to 
load the initrd, because pv-grub doesn't like it.

svn path=/nixos/trunk/; revision=24068
 2010-10-05 13:11:30 +00:00
Evgeny Egorochkin ac7ef33e4a Tor: socksListenAddress must always be in ip:port format 
svn path=/nixos/trunk/; revision=24022
 2010-10-02 02:19:17 +00:00
Rob Vermaas 7468ad50e0 nixos-option.sh: fix typo 
svn path=/nixos/trunk/; revision=24015
 2010-10-01 06:31:27 +00:00
Russell O'Connor 2811c7270a Replacing tsocks with torsocks. 
tsocks leaks DNS requests and is less secure than torsocks.

torsocks is a fork of tsocks that is patched specifically for Tor.


svn path=/nixos/trunk/; revision=24012
 2010-10-01 03:41:43 +00:00
Eelco Dolstra ab8a6d43c4 svn path=/nixos/trunk/; revision=23998 2010-09-30 13:53:30 +00:00
Evgeny Egorochkin 02f2b1f640 Fix lots of KDE functionality 
svn path=/nixos/trunk/; revision=23992
 2010-09-30 05:08:33 +00:00
Rob Vermaas 8a37500355 initial try for a nixos module for hydra channel mirroring 
svn path=/nixos/trunk/; revision=23990
 2010-09-29 11:31:09 +00:00
Eelco Dolstra deca72f3cf * Xen (or rather QEMU) needs /dev/net/tun, so load the tap 
module.

svn path=/nixos/trunk/; revision=23970
 2010-09-27 16:32:42 +00:00
Nicolas Pierron 567f37f3e4 Export tools which may be useful for users that want to switch to NixOS 
without using a live CD.

svn path=/nixos/trunk/; revision=23939
 2010-09-26 13:39:16 +00:00
Nicolas Pierron 62c9591d0b Fix usage message (-description) and honor $NIXOS instead of $NIXOS_PATH. 
svn path=/nixos/trunk/; revision=23937
 2010-09-26 08:43:55 +00:00
Evgeny Egorochkin bf3a8dfbe4 bashrc: make ALSA plugins discoverable 
svn path=/nixos/trunk/; revision=23932
 2010-09-26 03:49:33 +00:00
Evgeny Egorochkin 88b24ece7f Quassel: quick fix 
svn path=/nixos/trunk/; revision=23930
 2010-09-26 02:10:23 +00:00
Evgeny Egorochkin b766f8ac8d AMule: quick fix 
svn path=/nixos/trunk/; revision=23929
 2010-09-26 02:09:34 +00:00
Evgeny Egorochkin 3bca96e1bd AMule: create the user only if the user option is null, don't pollute the system profile with useless packages. 
svn path=/nixos/trunk/; revision=23928
 2010-09-26 02:04:06 +00:00
Evgeny Egorochkin d8c72719aa Quassel: Create quassel user only if cfg.user is left empty to avoid messing up existing users. 
This solution is still suboptimal but others are even worse.

svn path=/nixos/trunk/; revision=23927
 2010-09-26 01:58:44 +00:00
Nicolas Pierron 7ea957fd3d Add --install option for nixos-option which is used to handle options of 
the target system (when installing) and also to generate a template
configuration file for users.

svn path=/nixos/trunk/; revision=23923
 2010-09-25 22:29:50 +00:00
Nicolas Pierron 58ce746eb0 Add empty profile. 
svn path=/nixos/trunk/; revision=23922
 2010-09-25 22:29:42 +00:00
Nicolas Pierron fe7c1eb16b Remove duplicated definitions. 
svn path=/nixos/trunk/; revision=23921
 2010-09-25 09:44:48 +00:00
Nicolas Pierron e20ef7564e Update live-dvd configuration. 
svn path=/nixos/trunk/; revision=23919
 2010-09-25 09:33:17 +00:00
Nicolas Pierron c18fe31160 Make nixos-hardware-scan adding a profile to the generated configuration 
file.

svn path=/nixos/trunk/; revision=23918
 2010-09-25 09:33:13 +00:00
Nicolas Pierron 5fb80fcc4b Extract rescue profile from the the corresponding CD. 
svn path=/nixos/trunk/; revision=23917
 2010-09-25 09:33:09 +00:00
Nicolas Pierron 9936a6f525 Simplify system-tarball-pc.nix. Factor detected / undetected devices into 
the instalaltion-device profile.

svn path=/nixos/trunk/; revision=23916
 2010-09-25 09:33:03 +00:00
Nicolas Pierron f3cc01bd3b Extract graphical and minimal profiles from the installation CDs. 
svn path=/nixos/trunk/; revision=23915
 2010-09-25 09:32:57 +00:00
Nicolas Pierron 59429aa449 Change the policy used to select files added in the import list of the 
generated configuration.  Use all files listed as modules of eval-config.

svn path=/nixos/trunk/; revision=23914
 2010-09-25 09:32:52 +00:00
Nicolas Pierron d2d139e920 Move the generation of the dummy configuration file into the installation 
device profile.

TODO: The current configuration does not reproduce exactly the CD
configuration, fix it.

svn path=/nixos/trunk/; revision=23913
 2010-09-25 09:32:48 +00:00
Nicolas Pierron 112cd0c4d4 Add an installation device profile, and use it it the basic installation CD. 
svn path=/nixos/trunk/; revision=23912
 2010-09-25 09:32:43 +00:00
Nicolas Pierron cf103b8d4d Add 2 index file to define the default case for detected and not-detected 
devices.  These are used to replace hand made listings in the basic
installation CD.

The configuration file, which is generated by nixos-hardware-scan, enables
not-detected devices by default.

svn path=/nixos/trunk/; revision=23911
 2010-09-25 09:32:37 +00:00
Nicolas Pierron c90a7b9be4 Remove duplicated (modules-list) includes from the basic installation cd. 
svn path=/nixos/trunk/; revision=23910
 2010-09-25 09:32:32 +00:00
Nicolas Pierron d304d12f37 Extract a base profile from the basic installation cd. 
svn path=/nixos/trunk/; revision=23909
 2010-09-25 09:32:27 +00:00
Evgeny Egorochkin 9b7533c2fd KDE4: fix suid for kcheckpass, although suid doesn't seem to be needed if you use PAM 
svn path=/nixos/trunk/; revision=23906
 2010-09-22 23:08:05 +00:00
Evgeny Egorochkin 910103246f TOR: make torify work(only when enabled as a service. nix-env -i tor replaces it with a broken version.) 
svn path=/nixos/trunk/; revision=23905
 2010-09-22 23:07:59 +00:00
Evgeny Egorochkin c0751f83e9 Quassel: don't pollute profiles with useless files 
svn path=/nixos/trunk/; revision=23904
 2010-09-22 23:07:52 +00:00
Yury G. Kudryashov 1319531f28 Add system.path to PATH instead of overriding 
svn path=/nixos/trunk/; revision=23879
 2010-09-21 09:16:47 +00:00
Yury G. Kudryashov ca4b60d059 Auto add $prefix/lib/kde4/plugins to QT_PLUGIN_PATH 
svn path=/nixos/trunk/; revision=23872
 2010-09-20 14:10:46 +00:00
Evgeny Egorochkin 36fe7f69c6 Quassel: get rid of custom logging remnants 
svn path=/nixos/trunk/; revision=23867
 2010-09-20 01:44:07 +00:00
Evgeny Egorochkin e5aea56bb5 TOR: prevent creation of torPrivoxy.conf if Privoxy is disabled. 
Patch by Russel O'Connor

svn path=/nixos/trunk/; revision=23862
 2010-09-19 15:40:03 +00:00
Lluís Batlle i Rossell b9aa56969f Applying patch sent by roconnor about allowing "nix-env -S" in NixOS. I agree with the change. 
svn path=/nixos/trunk/; revision=23861
 2010-09-19 00:21:30 +00:00
Evgeny Egorochkin 385ec89817 TOR: client should be disabled by default 
svn path=/nixos/trunk/; revision=23860
 2010-09-18 16:36:03 +00:00
Evgeny Egorochkin 764f5f34fd Quassel: use the generic logging for jobs instead of rolling your own. 
svn path=/nixos/trunk/; revision=23854
 2010-09-18 12:50:55 +00:00
Evgeny Egorochkin 39193fa1e7 Folding@Home service: don't make binaries visible 
svn path=/nixos/trunk/; revision=23852
 2010-09-18 12:44:03 +00:00
Evgeny Egorochkin 41530c8e76 TOR service: sane default for burst rate 
svn path=/nixos/trunk/; revision=23851
 2010-09-18 12:43:48 +00:00
Evgeny Egorochkin b2b227c99f TOR service: refactored options to avoid mess 
svn path=/nixos/trunk/; revision=23850
 2010-09-18 11:30:14 +00:00
Evgeny Egorochkin 259c007f70 Quassel: use the convenience daemon package. 
svn path=/nixos/trunk/; revision=23849
 2010-09-18 11:30:09 +00:00
Evgeny Egorochkin 1b4c811d41 Added AMule daemon service 
svn path=/nixos/trunk/; revision=23848
 2010-09-18 11:30:04 +00:00
Lluís Batlle i Rossell c1e4586ed1 Again trying to get the kernelFile paths right 
svn path=/nixos/branches/stdenv-updates/; revision=23836
 2010-09-17 17:25:46 +00:00
Lluís Batlle i Rossell 743b75fbaf Making the fuloong2f system-tarball more specific for the fuloong, so, helping in how 
to use the system more easily.


svn path=/nixos/branches/stdenv-updates/; revision=23826
 2010-09-16 19:26:34 +00:00
Lluís Batlle i Rossell 3b216865d2 Writing better some sheevaplug system-tarball lines (kernel parameters in a single line, for example) 
svn path=/nixos/branches/stdenv-updates/; revision=23825
 2010-09-16 19:25:29 +00:00
Lluís Batlle i Rossell 83d012ba13 Trying to fix again system-tarball-pc (again, the kernel file name) 
svn path=/nixos/branches/stdenv-updates/; revision=23824
 2010-09-16 19:24:52 +00:00
Eelco Dolstra 0442e7e82a * Add Xen's udev rules. This is necessary to get automatically 
created block and network devices to work.

svn path=/nixos/trunk/; revision=23823
 2010-09-16 15:24:46 +00:00
Eelco Dolstra 82f97b5fb2 * Allow modules to add packages to the $PATH seen by programs called 
from udev rules.  This is slightly tricky because udev has a
  512-character limit on environment variables, so we create a symlink
  tree to work around this.

svn path=/nixos/trunk/; revision=23822
 2010-09-16 15:23:12 +00:00
Evgeny Egorochkin dc8eff071a Added Folding@Home service 
svn path=/nixos/trunk/; revision=23816
 2010-09-16 02:06:44 +00:00
Lluís Batlle i Rossell 7672c36a70 Trying to get system-tarball-pc build properly. 
svn path=/nixos/branches/stdenv-updates/; revision=23814
 2010-09-15 21:36:56 +00:00
Eelco Dolstra 5b3fd663ed * Don't set hostname to "", dhclient no longer needs it. 
svn path=/nixos/trunk/; revision=23783
 2010-09-14 11:58:55 +00:00
Eelco Dolstra 071b192c9d * Start dhclient after xend. 
svn path=/nixos/trunk/; revision=23782
 2010-09-14 11:58:06 +00:00
Eelco Dolstra 72d9235992 * Added an Upstart job for the Xen control daemon (xend). 
svn path=/nixos/trunk/; revision=23781
 2010-09-14 11:22:50 +00:00
Eelco Dolstra 8a6fad83f4 * Add a job attribute (path) to allow adding packages to the job's 
$PATH environment variable.

svn path=/nixos/trunk/; revision=23780
 2010-09-14 11:22:17 +00:00
Eelco Dolstra ea4d3e2c8c * Don't run dhclient on Xen's peth* devices. 
svn path=/nixos/trunk/; revision=23779
 2010-09-14 11:17:48 +00:00
Eelco Dolstra c4f910f550 * Substitute the path of the system derivation directly in the stage 2 
init script.  This removes the need for the `systemConfig' boot
  parameter; `init=<stage-2-init>' is enough.  However, the GRUB menu
  builder still needs to add `systemConfig' to the kernel command line
  for compatibility with old configurations.

svn path=/nixos/trunk/; revision=23775
 2010-09-13 22:10:25 +00:00
Lluís Batlle i Rossell 245df33c6c Making the system tarballs of fuloong and sheevaplug reference the proper nixpkgs, and not that of /etc/... 
svn path=/nixos/branches/stdenv-updates/; revision=23772
 2010-09-13 20:52:49 +00:00
Eelco Dolstra 4046056cdc * In the activation script, don't require the path to the "system" 
derivation on the command line.

svn path=/nixos/trunk/; revision=23770
 2010-09-13 18:19:15 +00:00
Eelco Dolstra d48e2fdb4d * Don't print kernel log messages twice. 
svn path=/nixos/trunk/; revision=23769
 2010-09-13 17:36:01 +00:00
Eelco Dolstra c8d1774f09 * Speed up the initialisation of /etc in the activation script a lot 
by doing it in Perl instead of in Bash.  Forking a zillion times is
  slow.

svn path=/nixos/trunk/; revision=23766
 2010-09-13 17:26:42 +00:00
Eelco Dolstra f8f04aa756 * Fix the tests. 
svn path=/nixos/trunk/; revision=23764
 2010-09-13 16:02:54 +00:00
Eelco Dolstra f729f12e4e Some cleanups in the activation script: 
* Moved some scriptlets to the appropriate modules.
* Put the scriptlet that sets the default path at the start, since it
  never makes sense not to have it there.  It no longer needs to be
  declared as a dependency.
* If a scriptlet has no dependencies, it can be denoted as a plain
  string (i.e., `noDepEntry' is not needed anymore).

svn path=/nixos/trunk/; revision=23762
 2010-09-13 15:41:38 +00:00
Eelco Dolstra f99e42cfbc * Doh. 
svn path=/nixos/trunk/; revision=23748
 2010-09-13 13:43:53 +00:00
Eelco Dolstra c1295661c4 * Added a command `nixos-rebuild build-vm-with-bootloader'. This is 
like `build-vm', but boots using the regular boot loader (i.e. GRUB
  1 or 2) rather than booting directly from the kernel/initrd.  Thus
  it allows testing of GRUB.

svn path=/nixos/trunk/; revision=23747
 2010-09-13 12:34:58 +00:00
Eelco Dolstra b756a1ee81 * Added an option to disable fsck on particular filesystems. 
svn path=/nixos/trunk/; revision=23744
 2010-09-13 11:46:35 +00:00
Eelco Dolstra e871e84159 * mkOverrideTemplate -> mkOverride. 
svn path=/nixos/trunk/; revision=23743
 2010-09-13 11:33:05 +00:00
Eelco Dolstra 6b2844c6b2 * Mount /proc/xen. 
svn path=/nixos/trunk/; revision=23741
 2010-09-12 22:56:54 +00:00
Eelco Dolstra 987dd76811 * Added a module to enable the Xen hypervisor. 
svn path=/nixos/trunk/; revision=23739
 2010-09-12 22:43:45 +00:00
Evgeny Egorochkin 9f06fb806c Fix TOR option descriptions: kbytes-> bytes 
svn path=/nixos/trunk/; revision=23735
 2010-09-11 11:43:09 +00:00
Eelco Dolstra 8edefa2960 * Grrr. Fix the sort order. 
svn path=/nixos/trunk/; revision=23732
 2010-09-10 17:35:13 +00:00
Eelco Dolstra 4ae4b7d47f * Support booting Xen in the Grub menu builder. 
svn path=/nixos/trunk/; revision=23730
 2010-09-10 17:15:35 +00:00
Eelco Dolstra 8f4139987e * Regex listing the system generations was selecting the number from 
only the first generation in the list.  (From Karn Kallio.)

svn path=/nixos/trunk/; revision=23728
 2010-09-10 15:47:06 +00:00
Eelco Dolstra 6258845b61 svn path=/nixos/trunk/; revision=23727 2010-09-10 15:25:58 +00:00
Eelco Dolstra 7b635ee4ed * "ls -d" -> "echo", since "ls" prints the current directory if 
nothing matches.

svn path=/nixos/trunk/; revision=23716
 2010-09-10 12:25:59 +00:00
Lluís Batlle i Rossell 9ba735714a Adding a system-tarball expression for the sheevaplug (which a previous commit already put a reference to) 
svn path=/nixos/branches/stdenv-updates/; revision=23690
 2010-09-08 17:15:31 +00:00
Lluís Batlle i Rossell ccf7852e11 Updating the system-tarball work, having just tested that of the fuloong2f. 
svn path=/nixos/branches/stdenv-updates/; revision=23689
 2010-09-08 16:53:36 +00:00
Lluís Batlle i Rossell 7fe1c5fe90 Making eval-config not pass 'platform' as a nixpkgs parameter, but expect a nixpkgs config attribute. 
svn path=/nixos/branches/stdenv-updates/; revision=23688
 2010-09-08 16:52:15 +00:00
Sander van der Burg 10a3bd6ffe Added virtualbox service, which fixes the RandR problem and also keeps the guest's clock in sync with the host 
svn path=/nixos/trunk/; revision=23672
 2010-09-07 13:28:17 +00:00
Nicolas Pierron c9dc3651da Replace mkOverride by its alias mkOverrideTemplate to remove the unused 
template argument of mkOverride later.

svn path=/nixos/trunk/; revision=23631
 2010-09-03 19:10:59 +00:00
Nicolas Pierron 1f69bc4b9d Remove deprecated notation in tools.nix. 
svn path=/nixos/trunk/; revision=23630
 2010-09-03 19:10:54 +00:00
Nicolas Pierron 9e04f67b3d Add nixos-option tool to investigate option details on the cmd-line. 
svn path=/nixos/trunk/; revision=23629
 2010-09-03 19:10:50 +00:00
Nicolas Pierron 6fa66ff7b9 Move matches just below the identifier. 
svn path=/nixos/trunk/; revision=23628
 2010-09-03 19:10:45 +00:00
Eelco Dolstra f1a6a8b6e0 svn path=/nixos/trunk/; revision=23614 2010-09-03 11:39:48 +00:00
Eelco Dolstra d550cc6d63 * Grmbl. Create the missing mount points. 
svn path=/nixos/trunk/; revision=23592
 2010-09-01 11:00:35 +00:00
Eelco Dolstra 2ac462c3c7 * Set NIX_CONF_DIR in cronjobs. Otherwise the garbage collector won't see 
the system nix.conf.

svn path=/nixos/trunk/; revision=23561
 2010-08-31 12:57:47 +00:00
Eelco Dolstra 68ebbb6093 * Put /nix on /ephemeral0 using AUFS (with the original /nix from the 
AMI as a base) because the root filesystem is rather small.

svn path=/nixos/trunk/; revision=23534
 2010-08-29 22:29:10 +00:00
Eelco Dolstra 34719e0c4a * On second thought, panicking in stage 1 doesn't help because it 
won't actually cause the instance to be terminated (even if
  "panic=1" were to be set), merely rebooted.

svn path=/nixos/trunk/; revision=23533
 2010-08-29 22:11:33 +00:00
Eelco Dolstra a242602b40 * /data -> /ephemeral0. 
* Put /tmp and /var on the /ephemeral0, as it has much more
  space than the root filesystem.
* Panic on stage 1 errors since they cannot be repaired anyway.

svn path=/nixos/trunk/; revision=23532
 2010-08-29 22:09:15 +00:00
Eelco Dolstra 4963f769d9 * Print the host public key on the console so that the user can obtain 
it securely by parsing the output of ec2-get-console-output.

svn path=/nixos/trunk/; revision=23524
 2010-08-29 21:03:22 +00:00
Michael Raskin 597e083d82 Adding an option to include build dependencies into ISO image 
svn path=/nixos/trunk/; revision=23502
 2010-08-29 12:11:31 +00:00
Eelco Dolstra 59b29535e5 * Include the Bluetooth module in module-list.nix. 
svn path=/nixos/trunk/; revision=23486
 2010-08-27 15:32:49 +00:00
Eelco Dolstra 4bca743766 * Typo. 
svn path=/nixos/trunk/; revision=23485
 2010-08-27 15:31:04 +00:00
Eelco Dolstra f067d179ab * Create /nix/var/nix/gcroots/tmp in the activation script. The 
build hook uses this directory to store temporary GC roots.  (It
  creates it if it doesn't exist, but it's better to do it here as
  well to ensure the right ownership and permissions.)
* Clear /nix/var/nix/gcroots/tmp and /nix/var/nix/temproots at boot
  time.

svn path=/nixos/trunk/; revision=23417
 2010-08-25 11:59:04 +00:00
Lluís Batlle i Rossell 63c3d72aa6 Updating the nvidiaLegacy nixos xserver driver to a numbered name, to match the current 
*two* possibilities of nvidia legacy driver in nixpkgs.


svn path=/nixos/trunk/; revision=23412
 2010-08-24 22:00:18 +00:00
Lluís Batlle i Rossell 1e7058d025 Removing the NvAGP special option for nvidiaLegacy. Although it helped in 
suspending the machine, it also slowed down the graphics (specially 2D) quite a lot.
firefox flash, firefox scrolling was a pain.

I'll leave that up to the nixos user with the cfg.deviceSection.


svn path=/nixos/trunk/; revision=23407
 2010-08-24 18:24:06 +00:00
Eelco Dolstra 3f10cf70f6 * Regression test for the build hook mechanism. 
svn path=/nixos/trunk/; revision=23395
 2010-08-24 13:27:28 +00:00
Eelco Dolstra 392275f185 * Move support for writable Nix stores to qemu-vm.nix. 
svn path=/nixos/trunk/; revision=23393
 2010-08-24 12:59:16 +00:00
Lluís Batlle i Rossell fe2f7eae17 Making the stage1 work on mips too (for the name of the dynamic loader) 
svn path=/nixos/trunk/; revision=23325
 2010-08-21 18:23:55 +00:00
Yury G. Kudryashov a7d7f1630f Will move digikam outside of kde4 in kde4.5, so change example 
svn path=/nixos/trunk/; revision=23266
 2010-08-19 23:07:14 +00:00
Eelco Dolstra 4c8fb8d4b2 * The "atd" job tends to fail randomly on startup for unknown 
reasons.  Doing "atd -f" seems to work better.

svn path=/nixos/trunk/; revision=23251
 2010-08-19 14:50:48 +00:00
Eelco Dolstra c55f496c52 * The ALSA job shouldn't be started until udevtrigger has finished. 
Otherwise the sound card drivers may not have been loaded yet, and
  restoring the mixer settings will fail.  Also, since the ALSA job
  itself will fail, it won't save the mixer settings on shutdown.

svn path=/nixos/trunk/; revision=23245
 2010-08-19 11:55:52 +00:00
Rob Vermaas e87a298c33 qemu virtualiztion: do not pass username on guest cifs mount, use sec=none in stead 
svn path=/nixos/trunk/; revision=23243
 2010-08-19 08:32:31 +00:00
Eelco Dolstra 1fcefe39a1 * Add share/emacs to the paths to symlink. 
svn path=/nixos/trunk/; revision=23184
 2010-08-16 08:00:18 +00:00
Eelco Dolstra 751ec4f845 * Xfce requires desktop-file-utils to create/update .desktop files. 
svn path=/nixos/trunk/; revision=23183
 2010-08-16 07:48:06 +00:00
Michael Raskin 295df77f21 Move resume section after udev launch - on some systems devices are recognized by kernel only after udev works. 
svn path=/nixos/trunk/; revision=23176
 2010-08-14 20:12:05 +00:00
Yury G. Kudryashov f0eb823a34 Add unix_chkpwd suid wrapper 
svn path=/nixos/trunk/; revision=23165
 2010-08-13 14:07:34 +00:00
Eelco Dolstra cfb465c7a5 svn path=/nixos/trunk/; revision=23115 2010-08-11 15:10:17 +00:00
Eelco Dolstra 2ec105cc85 * Separate building of the NixOS manual and manpages. Usually we only 
need the manpages, and the manual takes much longer to build.

svn path=/nixos/trunk/; revision=23112
 2010-08-11 12:28:53 +00:00
Eelco Dolstra 2e0a569187 * Use InputClass in the synaptics module to automatically use the 
synaptics driver for all touchpads (unless the "dev" option is set).
* Get rid of some synaptics options: SHMConfig, Repeater (obsolete);
  *Edge (usually auto-detected), Protocol (use auto-detect instead).

svn path=/nixos/trunk/; revision=23092
 2010-08-10 14:13:57 +00:00
Eelco Dolstra 5456815016 * Re-enable ctrl-alt-backspace to kill the X server. 
svn path=/nixos/trunk/; revision=23089
 2010-08-10 12:37:39 +00:00
Eelco Dolstra 313629adcf * Add ext4 to the default initrd. 
svn path=/nixos/trunk/; revision=23088
 2010-08-10 10:12:18 +00:00
Eelco Dolstra 8c960af984 * Handle the case where /boot is on the same filesystem as / 
but on a different filesystem than /nix/store.  In that case
  we need to copy the kernels and initrds to /boot.

svn path=/nixos/trunk/; revision=23085
 2010-08-10 08:36:59 +00:00
Eelco Dolstra cddc67a653 * Try to load the p4_clockmod kernel module, which provides 
CPU frequency scaling on some Intel CPUs.

svn path=/nixos/trunk/; revision=23082
 2010-08-10 01:00:09 +00:00
Eelco Dolstra 163a54886c * Include fontconfig in the system path (for fc-list, fc-match etc.). 
svn path=/nixos/trunk/; revision=23080
 2010-08-10 00:03:36 +00:00
Eelco Dolstra 8de6ab7dff * Enable the Xfce power manager. 
svn path=/nixos/trunk/; revision=23079
 2010-08-09 23:15:39 +00:00
Eelco Dolstra c388446bb0 * Xfce is now more or less functional. 
svn path=/nixos/trunk/; revision=23075
 2010-08-09 21:59:34 +00:00
Eelco Dolstra 31db968be4 * In QEMU, set a higher refresh rate in xorg.conf so that resolutions 
higher than 800x600 work.
* Add a "Monitor" statement to the "Screen" section, because otherwise
  the Monitor section is ignored.

svn path=/nixos/trunk/; revision=23068
 2010-08-09 20:10:16 +00:00
Eelco Dolstra 057602f3f2 * Some subdirectories should always be symlinked in the system path 
when X11 is enabled (e.g. etc/xdg, share/icons...).

svn path=/nixos/trunk/; revision=23062
 2010-08-09 18:04:55 +00:00
Eelco Dolstra f6497fa576 * Use the proper Xfce session start script. Include the desktop and 
the panel.

svn path=/nixos/trunk/; revision=23055
 2010-08-09 11:51:44 +00:00
Eelco Dolstra fc8204c0e4 * Always symlink etc/dbus-1 and share/dbus-1 in the system path, not 
just when KDE is enabled.

svn path=/nixos/trunk/; revision=23053
 2010-08-09 11:42:32 +00:00
Eelco Dolstra e41e6a65bb * Make sure that /tmp/.ICE-unix is owned by root and has 1777 
permissions.  Otherwise it ends up being owned by the first user to
  log in, and other users' iceauth calls fail.

svn path=/nixos/trunk/; revision=23052
 2010-08-09 10:59:20 +00:00
Eelco Dolstra 5041cdddbd * Start of an Xfce desktop manager module. Currently it just starts 
Xfwm and Terminal.

svn path=/nixos/trunk/; revision=23048
 2010-08-08 22:45:54 +00:00
Eelco Dolstra 6e118cd66b * Change the default desktop manager from "xterm" to the last imported 
and enabled desktop manager (e.g. "kde" if KDE is enabled, and
  "xterm" if nothing is explicitly enabled).  This means that you
  don't have to write

    services.xserver.desktopManager.default = "kde4";

  anymore in addition to

    services.xserver.desktopManager.kde4.enable = true;

  to make KDE the default desktop environment.
  
* Remove the "none + none" session type.

* Remove the "+ none" string at the end of session types.  I.e. now
  it's "kde", not "kde + none".

* In kdm, add coreutils to its SystemPath so that it can remove the
  temporary directories in /tmp that it creates.

svn path=/nixos/trunk/; revision=23036
 2010-08-08 14:05:32 +00:00
Eelco Dolstra 87dcdc05fe * Fix example. 
svn path=/nixos/trunk/; revision=23035
 2010-08-08 13:57:21 +00:00
Eelco Dolstra cbc05c1480 * Enable wpa_supplicant on the installation CD. 
svn path=/nixos/trunk/; revision=23034
 2010-08-08 13:55:35 +00:00
Eelco Dolstra 622a7d3d46 * If kdm is enabled, disabled slim automatically. This is so that 
users don't have to write

    services.xserver.displayManager.kdm.enable = true;
    services.xserver.displayManager.slim.enable = false;

  to enable kdm, but just

    services.xserver.displayManager.kdm.enable = true;


svn path=/nixos/trunk/; revision=23033
 2010-08-08 12:39:00 +00:00
Eelco Dolstra e8e7ee356c * In the installation CD, pass the label of the CD through the 
root=... kernel command line parameter, instead of hard-coding it in
  `fileSystems'.  This is to allow CD-to-USB converters such as
  UNetbootin to rewrite the kernel command line to the label or UUID
  of the USB stick.

svn path=/nixos/trunk/; revision=23024
 2010-08-07 14:16:18 +00:00
Michael Raskin 3cab6d3e1c Fixing extra /bin/sh in the shell - noticed by Eelco Dolstra 
svn path=/nixos/trunk/; revision=23021
 2010-08-07 11:16:06 +00:00
Michael Raskin dec8079468 Fix stdenv reference 
svn path=/nixos/trunk/; revision=23020
 2010-08-07 10:26:37 +00:00
Eelco Dolstra d7d2d5e3d5 * Add some NLS modules required to mount FAT filesystems. We need 
this to boot the NixOS installer from a USB stick.

svn path=/nixos/trunk/; revision=23019
 2010-08-06 23:09:37 +00:00