Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 020e1b0c8e4f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 676a988b8cca
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 18, 2019

  1. nixos/make-iso9660-image: Fix storeContents documentation 

    `packages` was renamed to `storeContents` in
668c146, but this comment
describing its purpose was not updated to match.
    @chkno
    chkno committed Oct 18, 2019
    Copy the full SHA
    4623f0a View commit details

  2. nixos/make-iso9660-image: Fix doc typo

    @chkno
    chkno committed Oct 18, 2019
    Copy the full SHA
    ac65940 View commit details

  3. Merge pull request #71355 from chkno/fix-storeContents-doc 

    nixos/make-iso9660-image: Fix storeContents documentation
    @worldofpeace
    worldofpeace authored Oct 18, 2019
    Copy the full SHA
    676a988 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 nixos/lib/make-iso9660-image.nix
6 changes: 3 additions & 3 deletions nixos/lib/make-iso9660-image.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ? []