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: c7866733d7ce
Choose a base ref
...
head repository: NixOS/nix
compare: 1dc29df1d384
Choose a head ref
  • 17 commits
  • 9 files changed
  • 7 contributors

Commits on Dec 20, 2019

  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.
    puffnfresh committed Dec 20, 2019
    Copy the full SHA
    d259232 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2019

  1. Pass -P to cp to preserve symlinks

    This is commonly the default behavior with -R, but POSIX leaves the
    default unspecified.
    michaelforney committed Dec 22, 2019
    Copy the full SHA
    10414d4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3287 from michaelforney/cp-flag

    Pass -P to cp to preserve symlinks
    edolstra committed Dec 22, 2019
    Copy the full SHA
    7dcfa80 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3284 from puffnfresh/wsl

    Disable use-sqlite-wal under WSL
    edolstra committed Dec 22, 2019
    Copy the full SHA
    aaf57c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2019

  1. Pass -J to tar for xz decompression

    Some tar implementations can't auto-detect compression formats, so
    they must be specified explicitly.
    michaelforney committed Dec 23, 2019
    Copy the full SHA
    43eb7b6 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2019

  1. Merge pull request #3289 from michaelforney/tar-J

    Pass -J to tar for xz decompression
    edolstra committed Dec 25, 2019
    Copy the full SHA
    b0cadf5 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2020

  1. exportReferencesGraph: support working

    Before, we would get:
    
        [deploy@bastion:~]$ nix-store -r /nix/store/grfnl76cahwls0igd2by2pqv0dimi8h2-nixos-system-eris-19.09.20191213.03f3def.drv
        these derivations will be built:
          /nix/store/3ka4ihvwh6wsyhpd2qa9f59506mnxvx1-initrd-linux-4.19.88.drv
          /nix/store/ssxwmll7v21did1c8j027q0m8w6pg41i-unit-prometheus-alertmanager-irc-notifier.service.drv
          /nix/store/mvyvkj46ay7pp7b1znqbkck2mq98k0qd-unit-script-network-local-commands-start.drv
          /nix/store/vsl1y9mz38qfk6pyirjwnfzfggz5akg6-unit-network-local-commands.service.drv
          /nix/store/wi5ighfwwb83fdmav6z6n2fw6npm9ffl-unit-prometheus-hydra-exporter.service.drv
          /nix/store/x0qkv535n75pbl3xn6nn1w7qkrg9wwyg-unit-prometheus-packet-sd.service.drv
          /nix/store/lv491znsjxdf51xnfxh9ld7r1zg14d52-unit-script-packet-sd-env-key-pre-start.drv
          /nix/store/nw4nzlca49agsajvpibx7zg5b873gk9f-unit-script-packet-sd-env-key-start.drv
          /nix/store/x674wwabdwjrkhnykair4c8mpxa9532w-unit-packet-sd-env-key.service.drv
          /nix/store/ywivz64ilb1ywlv652pkixw3vxzfvgv8-unit-wireguard-wg0.service.drv
          /nix/store/v3b648293g3zl8pnn0m1345nvmyd8dwb-unit-script-acme-selfsigned-status.nixos.org-start.drv
          /nix/store/zci5d3zvr6fgdicz6k7jjka6lmx0v3g4-unit-acme-selfsigned-status.nixos.org.service.drv
          /nix/store/f6pwvnm63d0kw5df0v7sipd1rkhqxk5g-system-units.drv
          /nix/store/iax8071knxk9c7krpm9jqg0lcrawf4lc-etc.drv
          /nix/store/grfnl76cahwls0igd2by2pqv0dimi8h2-nixos-system-eris-19.09.20191213.03f3def.drv
        error: invalid file name 'closure-init-0' in 'exportReferencesGraph'
    
    This was tough to debug, I didn't figure out which one was broken until I did:
    
        nix-store -r /nix/store/grfnl76cahwls0igd2by2pqv0dimi8h2-nixos-system-eris-19.09.20191213.03f3def.drv 2>&1 | grep  nix/store | xargs -n1 nix-store -r
    
    and then looking at the remaining build graph:
    
        $ nix-store -r /nix/store/grfnl76cahwls0igd2by2pqv0dimi8h2-nixos-system-eris-19.09.20191213.03f3def.drv
        these derivations will be built:
          /nix/store/3ka4ihvwh6wsyhpd2qa9f59506mnxvx1-initrd-linux-4.19.88.drv
          /nix/store/grfnl76cahwls0igd2by2pqv0dimi8h2-nixos-system-eris-19.09.20191213.03f3def.drv
        error: invalid file name 'closure-init-0' in 'exportReferencesGraph'
    
    and knowing the initrd build is before the system, then:
    
        $ nix show-derivation /nix/store/3ka4ihvwh6wsyhpd2qa9f59506mnxvx1-initrd-linux-4.19.88.drv
        {
          "/nix/store/3ka4ihvwh6wsyhpd2qa9f59506mnxvx1-initrd-linux-4.19.88.drv": {
            [...]
            "exportReferencesGraph": "closure-init-0 /nix/store/...-stage-1-init.sh closure-mdadm.conf-1 /nix/store/...-mdadm.conf closure-ubuntu.conf-2 ...",
            [...]
          }
        }
    
    I then searched the repo for "in 'exportReferencesGraph'", found this
    recently updated regex, and realized it was missing a "-".
    grahamc committed Jan 2, 2020
    Copy the full SHA
    c502831 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3296 from grahamc/export-reference-graph

    exportReferencesGraph: support working
    edolstra committed Jan 2, 2020
    Copy the full SHA
    3469062 View commit details
    Browse the repository at this point in the history
  3. passAsFile: hash the attribute name instead of numbering sequentially

    This makes the paths consistent without relying on ordering.
    
    Co-authored-by: edef <edef@edef.eu>
    puckipedia and edef1c committed Jan 2, 2020
    Copy the full SHA
    515c0a2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #3297 from edef1c/passasfile-hash

    passAsFile: hash the attribute name instead of numbering sequentially
    edolstra committed Jan 2, 2020
    Copy the full SHA
    3ad4a33 View commit details
    Browse the repository at this point in the history
  5. passAsFile: leave out the hash prefix

    Having a colon in the path may cause issues, and having the hash
    function indicated isn't actually necessary. We now verify the path 
    format in the tests to prevent regressions.
    edef1c committed Jan 2, 2020
    Copy the full SHA
    c65a6fa View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. Merge pull request #3298 from edef1c/passasfile-noprefix

    passAsFile: leave out the hash prefix
    edolstra committed Jan 3, 2020
    Copy the full SHA
    0de33cc View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2020

  1. build: recover store path when replacing fails

    This shouldn't happen in normal circumstances, but just in case
    attempt to move the temporary path back if possible.
    LnL7 committed Jan 4, 2020
    Copy the full SHA
    b33fefc View commit details
    Browse the repository at this point in the history
  2. build: fix path repairing when hash rewriting is required

    Handle store path repairing on darwin when sandboxing is enabled. Unlike
    on linux sandboxing on darwin still requires hash rewriting.
    LnL7 committed Jan 4, 2020
    Copy the full SHA
    7d448bc View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2020

  1. Hide FunctionCallTrace constructor/destructor

    This prevents them from being inlined. On gcc 9, this reduces the
    stack size needed for
    
      nix-instantiate '<nixpkgs>' -A texlive.combined.scheme-full --dry-run
    
    from 12.9 MiB to 4.8 MiB.
    edolstra committed Jan 5, 2020
    2
    Copy the full SHA
    cb90e38 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3302 from LnL7/darwin-repair-with-sandbox

    build: fix path repairing with the darwin sandbox
    edolstra committed Jan 5, 2020
    Copy the full SHA
    0486e87 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. Copy the full SHA
    1dc29df View commit details
    Browse the repository at this point in the history