mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 00:10:30 +00:00
Code Issues 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
parent 458c8381e0 296e6c4991
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 {
type = types.str;
default = builtins.currentSystem;
type = types.uniq types.str;
example = "i686-linux";
description = ''
Specifies the Nix platform type for which NixOS should be built.
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 =
{ system.nixosVersionSuffix = config.system.nixosVersionSuffix;
system.nixosRevision = config.system.nixosRevision;
nixpkgs.system = config.nixpkgs.system;
};
eval = evalModules {

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

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