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/nix
base: 906afedd238e
Choose a base ref
...
head repository: NixOS/nix
compare: e3e8ee04712d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 23, 2020

  1. installer: Handle edge case where the nix-daemon is already running o…

    …n the system
    
    On a systemd-based Linux distribution: If the user has previously had multi-user Nix installed on the system, removed it and then reinstalled multi-user Nix again the old nix-daemon.service will still be running when `scripts/install-systemd-multi-user.sh` tries to start it which results in nothing being done and the old daemon continuing its run.
    
    When a normal user then tries to use Nix through the daemon the nix binary will fail to connect to the nix-daemon as it does not belong to the currently installed Nix system. See below for steps to reproduce the issue that motivated this change.
    
    $ sh <(curl https://nixos.org/nix/install) --daemon
    
    $ sudo rm -rf /etc/nix /nix /root/.nix-profile /root/.nix-defexpr /root/.nix-channels /home/nix-installer/.nix-profile /home/nix-installer/.nix-defexpr /home/nix-installer/.nix-channels ~/.nix-channels ~/.nix-defexpr/ ~/.nix-profile /etc/profile.d/nix.sh.backup-before-nix /etc/profile.d/nix.sh; sed -i '/added by Nix installer$/d' ~/.bash_profile
    
    $ unset NIX_REMOTE
    
    $ sh <(curl https://nixos.org/nix/install) --daemon
    
    └$ export NIX_REMOTE=daemon
    
    └$ nix-env -iA nixpkgs.hello
    installing 'hello-2.10'
    error: cannot connect to daemon at '/nix/var/nix/daemon-socket/socket': No such file or directory
    (use '--show-trace' to show detailed location information)
    
    └$ sudo systemctl restart nix-daemon.service
    
    └$ nix-env -iA nixpkgs.hello
    installing 'hello-2.10'
    these paths will be fetched (6.09 MiB download, 27.04 MiB unpacked):
      /nix/store/2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10
      /nix/store/aag9d1y4wcddzzrpfmfp9lcmc7skd7jk-glibc-2.27
    copying path '/nix/store/aag9d1y4wcddzzrpfmfp9lcmc7skd7jk-glibc-2.27' from 'https://cache.nixos.org'...
    copying path '/nix/store/2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10' from 'https://cache.nixos.org'...
    building '/nix/store/w9adagg6vlikr799nkkqc9la5hbbpgmi-user-environment.drv'...
    created 2 symlinks in user environment
    Rovanion committed Jan 23, 2020
    Copy the full SHA
    a413594 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. Merge pull request #3328 from Rovanion/nix-daemon-already-running-whe…

    …n-installing-fix
    
    installer: Handle edge case where the nix-daemon is already running on the system
    edolstra committed Feb 19, 2020
    Copy the full SHA
    e3e8ee0 View commit details
    Browse the repository at this point in the history