Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d96c7a356383
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 970b2937f689
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 14, 2018

  1. bootStage1: fix cross build 

    (cherry picked from commit 9dd5dc5)
    @bgamari
    volth authored and bgamari committed Oct 14, 2018
    Copy the full SHA
    e1fbfca View commit details

  2. bootStage1: fix cross build (@matthewbauer's solution) 

    (cherry picked from commit b3dff39)
    @bgamari
    volth authored and bgamari committed Oct 14, 2018
    Copy the full SHA
    eb1dc55 View commit details

  3. Merge pull request #48377 from bgamari/cross-fixes-for-18.09 

    Cross fixes for 18.09
    @Mic92
    Mic92 authored Oct 14, 2018
    Copy the full SHA
    970b293 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/system/boot/stage-1.nix
4 changes: 2 additions & 2 deletions nixos/modules/system/boot/stage-1.nix
View file
Original file line number Diff line number Diff line change
@@ -251,9 +251,9 @@ let
postInstall = ''
echo checking syntax
# check both with bash
${pkgs.bash}/bin/sh -n $target
${pkgs.buildPackages.bash}/bin/sh -n $target
# and with ash shell, just in case
${extraUtils}/bin/ash -n $target
${pkgs.buildPackages.busybox}/bin/ash -n $target
'';

inherit udevRules extraUtils modulesClosure;