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: f9fbc9b11887
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f76d7b5e418b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 20, 2020

  1. nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs> 

    For imports, it is better to use ‘modulesPath’ than rely on <nixpkgs>
being correctly set. Some users may not have <nixpkgs> set correctly.
In addition, when ‘pure-eval=true’, <nixpkgs> is unset.
    @matthewbauer
    matthewbauer committed Apr 20, 2020
    Copy the full SHA
    c45295d View commit details

  2. Merge pull request #85620 from matthewbauer/use-modulesPath-for-nixos… 

    …-generate-config

nixos/nixos-generate-config.pl: use modulesPath instead of <nixpkgs>
    @edolstra
    edolstra authored Apr 20, 2020
    Copy the full SHA
    f76d7b5 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 nixos/modules/installer/tools/nixos-generate-config.pl
8 changes: 4 additions & 4 deletions nixos/modules/installer/tools/nixos-generate-config.pl
View file
Original file line number Diff line number Diff line change
@@ -180,7 +180,7 @@ sub pciCheck {
) )
{
# we need e.g. brcmfmac43602-pcie.bin
push @imports, "<nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix>";
push @imports, "(modulesPath + \"/hardware/network/broadcom-43xx.nix\")";
}

# Can't rely on $module here, since the module may not be loaded
@@ -279,7 +279,7 @@ sub usbCheck {

# Likewise for QEMU.
if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
push @imports, "<nixpkgs/nixos/modules/profiles/qemu-guest.nix>";
push @imports, "(modulesPath + \"/profiles/qemu-guest.nix\")";
}

# Also for Hyper-V.
@@ -296,7 +296,7 @@ sub usbCheck {

# Provide firmware for devices that are not detected by this script,
# unless we're in a VM/container.
push @imports, "<nixpkgs/nixos/modules/installer/scan/not-detected.nix>"
push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")"
if $virt eq "none";


@@ -549,7 +549,7 @@ sub multiLineList {
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, modulesPath, ... }:
{
imports =${\multiLineList(" ", @imports)};