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: a729883bf130
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 734488a00fab
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 1, 2020

  1. Disable use-sqlite-wal under WSL 

    Before:

    $ nix-channel --update
    unpacking channels...
    warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy (SQLITE_PROTOCOL)
    warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy (SQLITE_PROTOCOL)
    warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy (SQLITE_PROTOCOL)
    warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy (SQLITE_PROTOCOL)
    warning: SQLite database '/nix/var/nix/db/db.sqlite' is busy (SQLITE_PROTOCOL)

After:

    $ inst/bin/nix-channel --update
    unpacking channels...
    created 1 symlinks in user environment

I've seen complaints that "sandbox" caused problems under WSL but I'm
having no problems. I think recent changes could have fixed the issue.

(cherry picked from commit d259232)
Signed-off-by: Domen Kožar <domen@dev.si>
    @puffnfresh @domenkozar
    puffnfresh authored and domenkozar committed Jun 1, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    35f5da5 View commit details

  2. Merge pull request #3646 from NixOS/2.3-wsl 

    Disable use-sqlite-wal under WSL
    @edolstra
    edolstra authored Jun 1, 2020
    Copy the full SHA
    734488a View commit details
Showing with 12 additions and 1 deletion.
  1. +9 −0 src/libstore/globals.cc
  2. +3 −1 src/libstore/globals.hh
9 changes: 9 additions & 0 deletions src/libstore/globals.cc
View file
Original file line number Diff line number Diff line change
@@ -103,6 +103,15 @@ StringSet Settings::getDefaultSystemFeatures()
return features;
}

bool Settings::isWSL1()
{
struct utsname utsbuf;
uname(&utsbuf);
// WSL1 uses -Microsoft suffix
// WSL2 uses -microsoft-standard suffix
return hasSuffix(utsbuf.release, "-Microsoft");
}

const string nixVersion = PACKAGE_VERSION;

template<> void BaseSetting<SandboxMode>::set(const std::string & str)
4 changes: 3 additions & 1 deletion src/libstore/globals.hh
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,8 @@ class Settings : public Config {

StringSet getDefaultSystemFeatures();

bool isWSL1();

public:

Settings();
@@ -130,7 +132,7 @@ public:
Setting<bool> fsyncMetadata{this, true, "fsync-metadata",
"Whether SQLite should use fsync()."};

Setting<bool> useSQLiteWAL{this, true, "use-sqlite-wal",
Setting<bool> useSQLiteWAL{this, !isWSL1(), "use-sqlite-wal",
"Whether SQLite should use WAL mode."};

Setting<bool> syncBeforeRegistering{this, false, "sync-before-registering",