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

1096 commits

Author SHA1 Message Date
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