public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected some SVN service glitches; added switchable Nix

Browse Source 
svn path=/nixos/trunk/; revision=9662
This commit is contained in:
Michael Raskin 2007-11-13 15:51:24 +00:00
parent 8b85db0728
commit de01f56b42
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system/options.nix
View File

@ -906,6 +906,7 @@
};
notificationSender = mkOption {
default = "svn-server@example.org";
example = "svn-server@example.org";
description = "
The email address used in the Sender field of commit
@ -914,6 +915,7 @@
};
userCreationDomain = mkOption {
default = "example.org";
example = "example.org";
description = "
The domain from which user creation is allowed. A client can
@ -931,6 +933,13 @@
support WebDAV.
";
};
dataDir = mkOption {
default = "/no/such/path/exists";
description = "
Place to put SVN repository.
";
};
organization = {
@ -1476,6 +1485,14 @@ root ALL=(ALL) SETENV: ALL
";
};
nix = mkOption {
default = pkgs: pkgs.nixUnstable;
example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
description = "
Use non-default Nix easily. Be careful, though, not to break everything.
";
};
};

4
system/system.nix
View File

@ -31,7 +31,8 @@ rec {
manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
/*nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature*/
nix = config.environment.nix pkgs;
kernel = config.boot.kernel pkgs;
@ -225,6 +226,7 @@ rec {
pkgs.utillinux
pkgs.wirelesstools
nix
(pkgs.lowPrio (pkgs.nixUnstable)) /* Better safe than sorry */
nixosInstall
nixosRebuild
nixosCheckout