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: 3f76d762267c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5ea22a5b0058
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 10, 2018

  1. nixos/nix: ignore nix.checkConfig when cross-compiling (#48225) 

    * nixos/nix: ignore nix.checkConfig when cross-compiling

the check always fails because of architecture mismatch

* typos
    @matthewbauer
    volth authored and matthewbauer committed Nov 10, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    5ea22a5 View commit details
Showing with 9 additions and 5 deletions.
  1. +9 −5 nixos/modules/services/misc/nix-daemon.nix
14 changes: 9 additions & 5 deletions nixos/modules/services/misc/nix-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -62,11 +62,15 @@ let
''}
$extraOptions
END
'' + optionalString cfg.checkConfig ''
echo "Checking that Nix can read nix.conf..."
ln -s $out ./nix.conf
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
'');
'' + optionalString cfg.checkConfig (
if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then ''
echo "Ignore nix.checkConfig when cross-compiling"
'' else ''
echo "Checking that Nix can read nix.conf..."
ln -s $out ./nix.conf
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
'')
);

in