diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2019-10-23 12:12:59 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-23 12:12:59 +0000 |
| commit | 3547597c8c5db5e40e66119587777910e780da3d (patch) | |
| tree | d5f54a723ee6bb380b918cea195762d271a98ba0 /nixpkgs/nixos/lib | |
| parent | 0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (diff) | |
| parent | f35f0880f2cdbc8c1bc81492811251f120d7a9bc (diff) | |
Merge commit 'f35f0880f2cdbc8c1bc81492811251f120d7a9bc' into bump-nixpkgs
Diffstat (limited to 'nixpkgs/nixos/lib')
| -rw-r--r-- | nixpkgs/nixos/lib/make-iso9660-image.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/nixos/lib/make-iso9660-image.nix b/nixpkgs/nixos/lib/make-iso9660-image.nix index 8cd19b6e187..0f3f2b5b523 100644 --- a/nixpkgs/nixos/lib/make-iso9660-image.nix +++ b/nixpkgs/nixos/lib/make-iso9660-image.nix @@ -10,9 +10,9 @@ contents , # In addition to `contents', the closure of the store paths listed - # in `packages' are also placed in the Nix store of the CD. This is - # a list of attribute sets {object, symlink} where `object' if a - # store path whose closure will be copied, and `symlink' is a + # in `storeContents' are also placed in the Nix store of the CD. + # This is a list of attribute sets {object, symlink} where `object' + # is a store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the CD. storeContents ? [] |