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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db88cb401ba0
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d82b78bf51b2
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 7, 2020

  1. Fix segfault in gcc on i686-linux 

      src/libstore/ssh-store.cc: In constructor 'nix::SSHStore::SSHStore(const string&, const Params&)':
  src/libstore/ssh-store.cc:31:21: internal compiler error: Segmentation fault
               compress)
                       ^
  Please submit a full bug report,
  with preprocessed source if appropriate.

https://hydra.nixos.org/build/111545609
    @edolstra
    edolstra committed Feb 7, 2020
    Copy the full SHA
    d82b78b View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/libstore/ssh-store.cc
  2. +1 −1 src/libstore/store-api.hh
4 changes: 2 additions & 2 deletions src/libstore/ssh-store.cc
View file
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ class SSHStore : public RemoteStore

const Setting<Path> sshKey{(Store*) this, "", "ssh-key", "path to an SSH private key"};
const Setting<bool> compress{(Store*) this, false, "compress", "whether to compress the connection"};
const Setting<Path> remoteProgram{this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
const Setting<std::string> remoteStore{this, "", "remote-store", "URI of the store on the remote system"};
const Setting<Path> remoteProgram{(Store*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
const Setting<std::string> remoteStore{(Store*) this, "", "remote-store", "URI of the store on the remote system"};

SSHStore(const std::string & host, const Params & params)
: Store(params)
2 changes: 1 addition & 1 deletion src/libstore/store-api.hh
View file
Original file line number Diff line number Diff line change
@@ -676,7 +676,7 @@ class LocalFSStore : public virtual Store
public:

// FIXME: the (Store*) cast works around a bug in gcc that causes
// it to emit the call to the Option constructor. Clang works fine
// it to omit the call to the Setting constructor. Clang works fine
// either way.
const PathSetting rootDir{(Store*) this, true, "",
"root", "directory prefixed to all other paths"};