From 58e4f7d0cffb675d3c2026efa936d33d86d7ee2a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 19 Dec 2016 21:09:10 +0100 Subject: [PATCH] use nixpkgsVersion as default system.darwinLabel --- modules/system/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/system/default.nix b/modules/system/default.nix index 0e659bb4..8b4a6994 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -37,9 +37,9 @@ in ''; }; - system.nixdarwinLabel = mkOption { + system.darwinLabel = mkOption { type = types.str; - default = "16.09"; + default = pkgs.lib.nixpkgsVersion; }; }; @@ -47,12 +47,12 @@ in config = { system.build.toplevel = stdenvNoCC.mkDerivation { - name = "nixdarwin-system-${cfg.nixdarwinLabel}"; + name = "darwin-system-${cfg.darwinLabel}"; preferLocalBuild = true; activationScript = cfg.activationScripts.script.text; activationUserScript = cfg.activationScripts.userScript.text; - inherit (cfg) nixdarwinLabel; + inherit (cfg) darwinLabel; buildCommand = '' mkdir $out @@ -77,7 +77,7 @@ in echo -n "$systemConfig" > $out/systemConfig - echo -n "$nixdarwinLabel" > $out/nixdarwin-version + echo -n "$darwinLabel" > $out/darwin-version echo -n "$system" > $out/system ''; };