diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-19 14:45:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 14:45:17 +0000 |
| commit | 1e23a5a6e916ad5992916d7517af7b4fa928c812 (patch) | |
| tree | 0ed9f2bd14b1f8a1465813b64743cf2190f00fef /nixos/lib | |
| parent | 43522dc85187b9941aa13ede6d271cf1cb70e28a (diff) | |
| parent | c6d8a58e8d3a9751197e8f731e823c08f5ee5dc3 (diff) | |
| download | nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.gz nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.bz2 nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.lz nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.xz nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.zst nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.zip | |
Merge pull request #34795 from oxij/os/nixosLabel-pt2
nixos: labels part 2
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 8a3d8ed17701..b7a38760dd3a 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -84,7 +84,7 @@ let format' = format; in let nixpkgs = cleanSource pkgs.path; - channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} '' + channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' mkdir -p $out cp -prd ${nixpkgs} $out/nixos chmod -R u+w $out/nixos @@ -92,7 +92,7 @@ let format' = format; in let ln -s . $out/nixos/nixpkgs fi rm -rf $out/nixos/.git - echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix + echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix ''; metaClosure = pkgs.writeText "meta" '' |