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

Commits on Oct 8, 2019

  1. nixos-rebuild: Fix target-host using fish 

    I have `users.defaultUserShell = pkgs.fish;` set on my server and when I ran `nixos-rebuild switch --target-host …`, the command failed with the following error:

    fish: Unsupported use of '='. To run 'nix-store' with a modified environment, please use 'env PATH=… nix-store…'

That is because fish requires env to set environment variables for a program. It should also work on other shells.
    @jtojnar
    jtojnar committed Oct 8, 2019
    Copy the full SHA
    316d4fa View commit details

Commits on Oct 11, 2019

  1. Merge pull request #70734 from jtojnar/nixos-rebuild-remote-fish 

    nixos-rebuild: Fix target-host using fish
    @jtojnar
    jtojnar authored Oct 11, 2019
    Copy the full SHA
    1739d34 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/installer/tools/nixos-rebuild.sh
2 changes: 1 addition & 1 deletion nixos/modules/installer/tools/nixos-rebuild.sh
View file
Original file line number Diff line number Diff line change
@@ -111,7 +111,7 @@ buildHostCmd() {
if [ -z "$buildHost" ]; then
"$@"
elif [ -n "$remoteNix" ]; then
ssh $SSHOPTS "$buildHost" PATH="$remoteNix:$PATH" "$@"
ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "$@"
else
ssh $SSHOPTS "$buildHost" "$@"
fi