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
base: d60faae44155
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0d15004cbae4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 29, 2018

  1. nixos/lib/eval-config.nix: toString modulesPath 

    Referencing modulesPath in NixOS configurations can cause evaluation
errors in restricted mode.  If used as `${modulesPath}` (as in all
use-sites in nixpkgs) the modules subtree is copied into its own store
path. Access to this path will be forbidden in restricted mode.

Converting to a string solves this issue.
`${builtins.toString modulesPath}` will point to a subdirectory of the
nixpkgs tree out of which evalModules is called.

This change converts modulesPath to a string by default so that the
call-site doesn't have to anymore.
    @aherrmann
    aherrmann committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    044ceae View commit details
    Browse the repository at this point in the history

  2. Merge pull request #49401 from aherrmann/stringify-modules-path 

    nixos/lib/eval-config.nix: toString modulesPath
    @edolstra
    edolstra committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    0d15004 View commit details
    Browse the repository at this point in the history