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: a729883bf130
Choose a base ref
...
head repository: NixOS/nix
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
    Copy the full SHA
    35f5da5 View commit details
    Browse the repository at this point in the history

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

    Disable use-sqlite-wal under WSL
    @edolstra
    edolstra committed Jun 1, 2020
    Copy the full SHA
    734488a View commit details
    Browse the repository at this point in the history