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

Merge pull request #7278 from nbp/nixos-manual-x86

Browse Source 
Fix NixOS Manual builds
This commit is contained in:
Nicolas B. Pierron 2015-04-08 14:24:23 -07:00
commit c653111167
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/misc/nixpkgs.nix
View File

@ -59,8 +59,8 @@ in
}; };
nixpkgs.system = mkOption { nixpkgs.system = mkOption {
type = types.str; type = types.uniq types.str;
default = builtins.currentSystem; example = "i686-linux";
description = '' description = ''
Specifies the Nix platform type for which NixOS should be built. Specifies the Nix platform type for which NixOS should be built.
If unset, it defaults to the platform type of your host system. If unset, it defaults to the platform type of your host system.

1
nixos/modules/services/misc/nixos-manual.nix
View File

@ -14,6 +14,7 @@ let
versionModule = versionModule =
{ system.nixosVersionSuffix = config.system.nixosVersionSuffix; { system.nixosVersionSuffix = config.system.nixosVersionSuffix;
system.nixosRevision = config.system.nixosRevision; system.nixosRevision = config.system.nixosRevision;
nixpkgs.system = config.nixpkgs.system;
}; };
eval = evalModules { eval = evalModules {

3
nixos/modules/services/networking/btsync.nix
View File

@ -200,7 +200,6 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.bittorrentSync14;
example = literalExample "pkgs.bittorrentSync20"; example = literalExample "pkgs.bittorrentSync20";
description = '' description = ''
Branch of bittorrent sync to use. Branch of bittorrent sync to use.
@ -277,6 +276,8 @@ in
} }
]; ];
services.btsync.package = mkOptionDefault pkgs.bittorrentSync14;
users.extraUsers.btsync = { users.extraUsers.btsync = {
description = "Bittorrent Sync Service user"; description = "Bittorrent Sync Service user";
home = cfg.storagePath; home = cfg.storagePath;