From 4623f0a2c641673af19f6cfcdc8627ecf4727db1 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 18 Oct 2019 11:46:55 -0700 Subject: [PATCH 1/2] nixos/make-iso9660-image: Fix storeContents documentation `packages` was renamed to `storeContents` in 668c146e33291e933ccfb19fd39fab9cd2b7900d, but this comment describing its purpose was not updated to match. --- nixos/lib/make-iso9660-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 8cd19b6e187..2c3026875c0 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/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' + # if a store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the CD. storeContents ? [] From ac65940537f364cc95508d055955a7c030e31b55 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 18 Oct 2019 11:54:54 -0700 Subject: [PATCH 2/2] nixos/make-iso9660-image: Fix doc typo --- nixos/lib/make-iso9660-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 2c3026875c0..0f3f2b5b523 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -12,7 +12,7 @@ , # In addition to `contents', the closure of the store paths listed # in `storeContents' 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 + # is a store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the CD. storeContents ? []